(accumulo) branch 2.1 updated: Adds missing return statement

[ddanielr]

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

ddanielr pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new ee27757965 Adds missing return statement
ee27757965 is described below

commit ee2775796551ce35d7e75cf3507669c94a57fa30
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Mon Jul 13 19:42:49 2026 +0000

    Adds missing return statement
    
    Adds a missing return statement to the gracefulShutdown RPC.
    
    Also updated log messages to report the user that is requesting the
    shutdown rpc.
---
 .../java/org/apache/accumulo/server/AbstractServer.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java 
b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
index f3c8d58698..627ea19b67 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
@@ -166,8 +166,9 @@ public abstract class AbstractServer
 
     try {
       if 
(!context.getSecurityOperation().canPerformSystemActions(credentials)) {
-        log.warn("Ignoring shutdown request, user " + 
credentials.getPrincipal()
-            + " does not have the appropriate permissions.");
+        log.warn("Ignoring shutdown request, user {} does not have the 
appropriate permissions",
+            credentials.getPrincipal());
+        return;
       }
     } catch (ThriftSecurityException e) {
       log.error(
@@ -180,9 +181,10 @@ public abstract class AbstractServer
       // Don't interrupt the server thread, that will cause
       // IO operations to fail as the servers are finishing
       // their work.
-      log.info("Graceful shutdown initiated.");
+      log.info("Graceful shutdown initiated by user {}", 
credentials.getPrincipal());
     } else {
-      log.warn("Graceful shutdown previously requested.");
+      log.warn("Graceful shutdown previously requested. Requested again by 
user {}",
+          credentials.getPrincipal());
     }
   }
 
@@ -228,10 +230,10 @@ public abstract class AbstractServer
       verificationThread.interrupt();
       verificationThread.join();
     }
-    log.info(getClass().getSimpleName() + " process shut down.");
+    log.info("{} process shut down", getClass().getSimpleName());
     Throwable thrown = err.get();
     if (thrown != null) {
-      System.err.println("Uncaught execption in AbstractServer.runServer");
+      System.err.println("Uncaught exception in AbstractServer.runServer");
       thrown.printStackTrace();
       System.err.flush();
       log.error("Uncaught exception ", thrown);