fix Admin lostLock

kevinrr888 · Dec 10, 2024 · 8cc7b39 · 8cc7b39
1 parent f3fd473
commit 8cc7b39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -376,8 +376,11 @@ class AdminLockWatcher implements ServiceLock.AccumuloLockWatcher {
     @Override
     public void lostLock(ServiceLock.LockLossReason reason) {
       String msg = "Admin lost lock: " + reason.toString();
-      log.warn(msg);
-      Halt.halt(msg, 1);
+      if (reason == ServiceLock.LockLossReason.LOCK_DELETED) {
+        Halt.halt(msg, 0);
+      } else {
+        Halt.halt(msg, 1);
+      }
     }
 
     @Override

diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsIT.java b/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsIT.java
@@ -555,7 +555,7 @@ protected void testFateFailCommandTimeout(FateStore<LatchTestEnv> store, ServerC
     // This should not work as it is already reserved and being worked on by our running FATE
     // ('fate'). Admin should try to reserve it for a bit, but should fail and exit
     ProcessInfo p = getCluster().exec(Admin.class, "fate", fateId1.canonical(), "--fail");
-    assertNotEquals(0, p.getProcess().waitFor());
+    assertEquals(0, p.getProcess().waitFor());
     String result = p.readStdOut();
 
     assertTrue(result.contains("Could not fail " + fateId1 + " in a reasonable time"));
@@ -632,7 +632,7 @@ protected void testFateDeleteCommandTimeout(FateStore<LatchTestEnv> store, Serve
     // This should not work as it is already reserved and being worked on by our running FATE
     // ('fate'). Admin should try to reserve it for a bit, but should fail and exit
     ProcessInfo p = getCluster().exec(Admin.class, "fate", fateId1.canonical(), "--delete");
-    assertNotEquals(0, p.getProcess().waitFor());
+    assertEquals(0, p.getProcess().waitFor());
     String result = p.readStdOut();
 
     assertTrue(result.contains("Could not delete " + fateId1 + " in a reasonable time"));