Amend HBASE-27194 Add test coverage for SimpleRpcServer (#4616)

When backporting to branch-2 it was discovered that the order of tear down operations requires the KDC to be torn down first, although on master branch the original code did not produce the same errors (a NPE in KDC#stop). Forward port the difference for maintainability. Signed-off-by: Andrew Purtell <[email protected]>
apache · Jul 13, 2022 · 01b45e2 · 01b45e2
1 parent 84f0d14
commit 01b45e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSecureNettyRpcServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSecureNettyRpcServer.java
@@ -69,11 +69,11 @@ public void setup() throws Exception {
 
   @After
   public void tearDown() throws Exception {
-    super.tearDown();
     if (KDC != null) {
       KDC.stop();
     }
     KEYTAB_FILE.delete();
+    super.tearDown();
     TEST_UTIL.cleanupTestDir();
   }
 

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSecureSimpleRpcServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSecureSimpleRpcServer.java
@@ -70,11 +70,11 @@ public static void setupClass() throws Exception {
 
   @AfterClass
   public static void tearDownClass() throws Exception {
-    TestSimpleRpcServer.tearDownClass();
     if (KDC != null) {
       KDC.stop();
     }
     KEYTAB_FILE.delete();
+    TestSimpleRpcServer.tearDownClass();
     TEST_UTIL.cleanupTestDir();
   }