ctubbsii commented on PR #5174:
URL: https://github.com/apache/accumulo/pull/5174#issuecomment-2540106877
The diffs here are probably not going to be very helpful. The more relevant
diff is between these changed files and the current contents of 3.1 and main.
Some of these differences go away when merging into 3.1, and most of the rest
goes away when merging into main. There are a few small improvements in here
that I do expect to include in the main branch, though. Those are specifically:
```patch
diff --git a/assemble/bin/accumulo-cluster b/assemble/bin/accumulo-cluster
index a87ad4938a..31dff57d81 100755
--- a/assemble/bin/accumulo-cluster
+++ b/assemble/bin/accumulo-cluster
@@ -38,7 +38,7 @@ Commands:
start-here Deprecated. Alias for "start --local --all"
stop-here Deprecated. Alias for "stop --local --all"
restart [--local] [--all | [--manager] [--gc] [--monitor]
[--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
- Restarts the Accumulo cluster
+ Restarts Accumulo cluster services
start [--local] [--all | [--manager] [--gc] [--monitor]
[--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
Starts Accumulo cluster services
stop [--local] [--all | [--manager] [--gc] [--monitor]
[--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
@@ -53,7 +53,7 @@ Commands:
accumulo-cluster start --local # start all
local services
accumulo-cluster start --local --manager # start local
manager services
accumulo-cluster start --tservers # start all
tservers
- accumulo-cluster start --tservers=group1 # start all
group1 tservers
+ accumulo-cluster start --sservers=group1 # start all
group1 sservers
accumulo-cluster start --local --manager --tservers # Start the
local manager and local tservers
EOF
@@ -140,7 +140,7 @@ function parse_args {
if [[ $ARG_ALL == 1 && ($ARG_MANAGER == 1 ||
$ARG_GC == 1 || $ARG_MONITOR == 1 || $ARG_TSERVER == 1 ||
$ARG_SSERVER == 1 || $ARG_COMPACTOR == 1) ]]; then
- echo "--all cannot be used with other options"
+ echo -- "--all cannot be used with other options"
print_usage
exit 1
fi
@@ -152,20 +152,17 @@ function parse_args {
ARG_ALL=1
fi
- if isDebug; then
- echo "DEBUG=$DEBUG"
- echo "ARG_ALL=$ARG_ALL"
- echo "ARG_LOCAL=$ARG_LOCAL"
- echo "ARG_MANAGER=$ARG_MANAGER"
- echo "ARG_GC=$ARG_GC"
- echo "ARG_MONITOR=$ARG_MONITOR"
- echo "ARG_TSERVER=$ARG_TSERVER"
- echo "ARG_TSERVER_GROUP=$ARG_TSERVER_GROUP"
- echo "ARG_SSERVER=$ARG_SSERVER"
- echo "ARG_SSERVER_GROUP=$ARG_SSERVER_GROUP"
- echo "ARG_COMPACTOR=$ARG_COMPACTOR"
- echo "ARG_COMPACTOR_GROUP=$ARG_COMPACTOR_GROUP"
- fi
+ debug "ARG_ALL=$ARG_ALL"
+ debug "ARG_LOCAL=$ARG_LOCAL"
+ debug "ARG_MANAGER=$ARG_MANAGER"
+ debug "ARG_GC=$ARG_GC"
+ debug "ARG_MONITOR=$ARG_MONITOR"
+ debug "ARG_TSERVER=$ARG_TSERVER"
+ debug "ARG_TSERVER_GROUP=$ARG_TSERVER_GROUP"
+ debug "ARG_SSERVER=$ARG_SSERVER"
+ debug "ARG_SSERVER_GROUP=$ARG_SSERVER_GROUP"
+ debug "ARG_COMPACTOR=$ARG_COMPACTOR"
+ debug "ARG_COMPACTOR_GROUP=$ARG_COMPACTOR_GROUP"
}
function invalid_args {
diff --git a/assemble/bin/accumulo-service b/assemble/bin/accumulo-service
index ae5c424de8..e56e647227 100755
--- a/assemble/bin/accumulo-service
+++ b/assemble/bin/accumulo-service
@@ -111,7 +111,7 @@ function start_service() {
rotate_log "$outfile"
rotate_log "$errfile"
- nohup "${bin}/accumulo" "$service_type" "$@" "${PROPERTY_OVERRIDES[@]}"
>"$outfile" 2>"$errfile" </dev/null &
+ nohup "${bin}/accumulo" "$service_type" "$@" >"$outfile" 2>"$errfile"
</dev/null &
echo "$!" >"${pid_file}"
done
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
