From 01b45e285d491d4ca143782674c66cfae7de3427 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Wed, 13 Jul 2022 11:23:07 -0700 Subject: [PATCH] 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 --- .../org/apache/hadoop/hbase/ipc/TestSecureNettyRpcServer.java | 2 +- .../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 b1f650d440d1..6cea79039677 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 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 index 9b5d1ebfe925..7a3961f73c07 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 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(); }