(accumulo) branch 2.1 updated: Fix issue when SERVICE_INSTANCE is empty string (#4773)

[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 e4e8613e6d Fix issue when SERVICE_INSTANCE is empty string (#4773)
e4e8613e6d is described below

commit e4e8613e6d898eee60172640d536bb7ab5cca177
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Sun Jul 28 19:49:43 2024 -0400

    Fix issue when SERVICE_INSTANCE is empty string (#4773)
    
    When ACCUMULO_SERVICE_INSTANCE is an empty string the service_name is
    set to the next OPT "-a". This causes an issue with the run files.
    
    This change checks to make sure it's not "-a" and sets the service name
    correctly.
---
 assemble/bin/accumulo-service | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/assemble/bin/accumulo-service b/assemble/bin/accumulo-service
index 6d7edb5283..390728fddc 100755
--- a/assemble/bin/accumulo-service
+++ b/assemble/bin/accumulo-service
@@ -200,7 +200,7 @@ function main() {
   local service_type="$1"
   local command_name="$2"
   shift 2
-  local service_name="unknown"
+  local service_name=$service_type
   local all_flag=false
 
   if [[ $service_type == "master" ]]; then
@@ -215,7 +215,9 @@ function main() {
       all_flag=true
     else
       # A named service has been specified
-      service_name="$1"
+      if [[ $1 != "-a" ]]; then
+        service_name="$1"
+      fi
     fi
   # Use the special bash env var from accumulo-cluster
   else