[hbase] branch master updated: Amend HBASE-27194 Add test coverage for SimpleRpcServer (#4616)

[apurtell]

This is an automated email from the ASF dual-hosted git repository.

apurtell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 01b45e285d4 Amend HBASE-27194 Add test coverage for SimpleRpcServer 
(#4616)
01b45e285d4 is described below

commit 01b45e285d491d4ca143782674c66cfae7de3427
Author: Andrew Purtell <apurt...@apache.org>
AuthorDate: Wed Jul 13 11:23:07 2022 -0700

    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 <apurt...@apache.org>
---
 .../test/java/org/apache/hadoop/hbase/ipc/TestSecureNettyRpcServer.java | 2 +-
 .../java/org/apache/hadoop/hbase/ipc/TestSecureSimpleRpcServer.java     | 2 +-
 2 files changed, 2 insertions(+), 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
index b1f650d440d..6cea7903967 100644
--- 
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 class TestSecureNettyRpcServer extends 
TestNettyRpcServer {
 
   @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
index 9b5d1ebfe92..7a3961f73c0 100644
--- 
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 class TestSecureSimpleRpcServer extends 
TestSimpleRpcServer {
 
   @AfterClass
   public static void tearDownClass() throws Exception {
-    TestSimpleRpcServer.tearDownClass();
     if (KDC != null) {
       KDC.stop();
     }
     KEYTAB_FILE.delete();
+    TestSimpleRpcServer.tearDownClass();
     TEST_UTIL.cleanupTestDir();
   }