This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 9f43ee92dd Reduce ssh connections to hosts in accumulo-cluster (#5066)
9f43ee92dd is described below
commit 9f43ee92dded29c2439bd0c1856188ab2a530542
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Nov 15 15:15:47 2024 -0500
Reduce ssh connections to hosts in accumulo-cluster (#5066)
The accumulo-cluster script would ssh to the host for each
server that it wanted to start or stop. This change moves
the processing of the number of servers that need to be started
or stopped to the accumulo-service script so that only one
ssh connection needs to be created to the host for that
server type and group.
---
assemble/bin/accumulo-cluster | 46 ++++++-------------
assemble/bin/accumulo-service | 103 ++++++++++++++++++++++++++++++++----------
assemble/conf/accumulo-env.sh | 6 +--
3 files changed, 97 insertions(+), 58 deletions(-)
diff --git a/assemble/bin/accumulo-cluster b/assemble/bin/accumulo-cluster
index 24154dfbbd..0500eb3019 100755
--- a/assemble/bin/accumulo-cluster
+++ b/assemble/bin/accumulo-cluster
@@ -151,40 +151,24 @@ function control_service() {
service="$3"
servers_per_host="$4"
- # Find the group parameter if any
- GROUP_PATTERN="^(compactor.group|sserver.group|tserver.group)=(.*)$"
- group="default"
- for param in "$@"; do
- if [[ $param =~ $GROUP_PATTERN ]]; then
- group="${BASH_REMATCH[2]}"
+ if [[ $host == localhost || $host == "$(hostname -s)" || $host ==
"$(hostname -f)" || "$(hostname -I)" =~ $host ]]; then
+ #
+ # The server processes take arguments using "-o". Always add the
"general.process.bind.addr" argument
+ # using the value of $host
+ #
+ if [[ $# -gt 4 ]]; then
+ debugAndRun ACCUMULO_CLUSTER_ARG="${servers_per_host}"
"${bin}/accumulo-service" "$service" "$control_cmd" "-o"
"general.process.bind.addr=$host" "${@:5}"
+ else
+ debugAndRun ACCUMULO_CLUSTER_ARG="${servers_per_host}"
"${bin}/accumulo-service" "$service" "$control_cmd" "-o"
"general.process.bind.addr=$host"
fi
- done
-
- local last_instance_id
- last_instance_id=${servers_per_host:-1}
-
- for ((inst_id = 1; inst_id <= last_instance_id; inst_id++)); do
- ACCUMULO_SERVICE_INSTANCE="_${group}_${inst_id}"
-
- if [[ $host == localhost || $host == "$(hostname -s)" || $host ==
"$(hostname -f)" || "$(hostname -I)" =~ $host ]]; then
- #
- # The server processes take arguments using "-o". Always add the
"general.process.bind.addr" argument
- # using the value of $host
- #
- if [[ $# -gt 4 ]]; then
- debugAndRun ACCUMULO_SERVICE_INSTANCE="${ACCUMULO_SERVICE_INSTANCE}"
"${bin}/accumulo-service" "$service" "$control_cmd" "-o"
"general.process.bind.addr=$host" "${@:5}"
- else
- debugAndRun ACCUMULO_SERVICE_INSTANCE="${ACCUMULO_SERVICE_INSTANCE}"
"${bin}/accumulo-service" "$service" "$control_cmd" "-o"
"general.process.bind.addr=$host"
- fi
+ else
+ if [[ $# -gt 4 ]]; then
+ EXTRA_ARGS="${*:5}"
+ debugAndRun "$SSH" "$host" "bash -c
'ACCUMULO_CLUSTER_ARG=${servers_per_host} ${bin}/accumulo-service \"$service\"
\"$control_cmd\" \"-o\" \"general.process.bind.addr=$host\" $EXTRA_ARGS '"
else
- if [[ $# -gt 4 ]]; then
- EXTRA_ARGS="${*:5}"
- debugAndRun "$SSH" "$host" "bash -c
'ACCUMULO_SERVICE_INSTANCE=${ACCUMULO_SERVICE_INSTANCE} ${bin}/accumulo-service
\"$service\" \"$control_cmd\" \"-o\" \"general.process.bind.addr=$host\"
$EXTRA_ARGS '"
- else
- debugAndRun "$SSH" "$host" "bash -c
'ACCUMULO_SERVICE_INSTANCE=${ACCUMULO_SERVICE_INSTANCE} ${bin}/accumulo-service
\"$service\" \"$control_cmd\" \"-o\" \"general.process.bind.addr=$host\"'"
- fi
+ debugAndRun "$SSH" "$host" "bash -c
'ACCUMULO_CLUSTER_ARG=${servers_per_host} ${bin}/accumulo-service \"$service\"
\"$control_cmd\" \"-o\" \"general.process.bind.addr=$host\"'"
fi
- done
+ fi
}
function start_service() {
diff --git a/assemble/bin/accumulo-service b/assemble/bin/accumulo-service
index b829ec6db4..6181ef9a62 100755
--- a/assemble/bin/accumulo-service
+++ b/assemble/bin/accumulo-service
@@ -58,31 +58,65 @@ function rotate_log() {
fi
}
+function get_group() {
+ # Find the group parameter if any
+ GROUP_PATTERN="^(compactor.group|sserver.group|tserver.group)=(.*)$"
+ group="default"
+ for param in "$@"; do
+ if [[ $param =~ $GROUP_PATTERN ]]; then
+ group="${BASH_REMATCH[2]}"
+ fi
+ done
+ echo "${group}"
+}
+
function start_service() {
local service_type=$1
local service_name=$2
shift 2
- local pid_file="${ACCUMULO_PID_DIR}/accumulo-${service_name}.pid"
- if [[ -f $pid_file ]]; then
- pid=$(cat "$pid_file")
- if kill -0 "$pid" 2>/dev/null; then
- echo "$HOST : ${service_name} already running (${pid})"
- exit 0
- fi
+ local build_service_name="false"
+ if [[ -n $service_name ]]; then
+ # if service_name is supplied, then we are only starting one instance
+ servers_per_host=1
+ else
+ build_service_name="true"
+ servers_per_host=${ACCUMULO_CLUSTER_ARG:-1}
fi
- echo "Starting $service_name on $HOST"
- if [[ ${service_type} == "manager" ]]; then
- "${bin}/accumulo" org.apache.accumulo.manager.state.SetGoalState NORMAL
- fi
- outfile="${ACCUMULO_LOG_DIR}/${service_name}_${HOST}.out"
- errfile="${ACCUMULO_LOG_DIR}/${service_name}_${HOST}.err"
- rotate_log "$outfile"
- rotate_log "$errfile"
+ group=$(get_group "$@")
- nohup "${bin}/accumulo" "$service_type" "$@" >"$outfile" 2>"$errfile"
</dev/null &
- echo "$!" >"${pid_file}"
+ for ((process_num = 1; process_num <= servers_per_host; process_num++)); do
+ if [[ ${build_service_name} == "true" ]]; then
+ service_name="${service_type}_${group}_${process_num}"
+ fi
+ # The ACCUMULO_SERVICE_INSTANCE variable is used in
+ # accumulo-env.sh to set parameters on the command
+ # line.
+ export ACCUMULO_SERVICE_INSTANCE="${service_name}"
+
+ local pid_file="${ACCUMULO_PID_DIR}/accumulo-${service_name}.pid"
+ if [[ -f $pid_file ]]; then
+ pid=$(cat "$pid_file")
+ if kill -0 "$pid" 2>/dev/null; then
+ echo "$HOST : ${service_name} already running (${pid})"
+ exit 0
+ fi
+ fi
+ echo "Starting $service_name on $HOST"
+
+ if [[ ${service_type} == "manager" ]]; then
+ "${bin}/accumulo" org.apache.accumulo.manager.state.SetGoalState NORMAL
+ fi
+ outfile="${ACCUMULO_LOG_DIR}/${service_name}_${HOST}.out"
+ errfile="${ACCUMULO_LOG_DIR}/${service_name}_${HOST}.err"
+ rotate_log "$outfile"
+ rotate_log "$errfile"
+
+ nohup "${bin}/accumulo" "$service_type" "$@" >"$outfile" 2>"$errfile"
</dev/null &
+ echo "$!" >"${pid_file}"
+
+ done
# Check the max open files limit and selectively warn
max_files_open=$(ulimit -n)
@@ -125,6 +159,18 @@ function stop_service() {
local pid_file="${ACCUMULO_PID_DIR}/accumulo-${process}.pid"
control_process "TERM" "$process" "$pid_file"
done
+ elif [[ -n $ACCUMULO_CLUSTER_ARG ]]; then
+
+ servers_per_host=${ACCUMULO_CLUSTER_ARG:-1}
+ group=$(get_group "$@")
+
+ for ((process_num = 1; process_num <= servers_per_host; process_num++)); do
+ service_name="${service_type}_${group}_${process_num}"
+ echo "Stopping service process: $service_name"
+ local pid_file="${ACCUMULO_PID_DIR}/accumulo-${service_name}.pid"
+ control_process "TERM" "$service_name" "$pid_file"
+ done
+
else
echo "Stopping service process: $service_name"
local pid_file="${ACCUMULO_PID_DIR}/accumulo-${service_name}.pid"
@@ -142,6 +188,18 @@ function kill_service() {
local pid_file="${ACCUMULO_PID_DIR}/accumulo-${process}.pid"
control_process "KILL" "$process" "$pid_file"
done
+ elif [[ -n $ACCUMULO_CLUSTER_ARG ]]; then
+
+ servers_per_host=${ACCUMULO_CLUSTER_ARG:-1}
+ group=$(get_group "$@")
+
+ for ((process_num = 1; process_num <= servers_per_host; process_num++)); do
+ service_name="${service_type}_${group}_${process_num}"
+ echo "Stopping service process: $service_name"
+ local pid_file="${ACCUMULO_PID_DIR}/accumulo-${service_name}.pid"
+ control_process "KILL" "$service_name" "$pid_file"
+ done
+
else
local pid_file="${ACCUMULO_PID_DIR}/accumulo-${service_name}.pid"
control_process "KILL" "$service_name" "$pid_file"
@@ -198,11 +256,11 @@ function main() {
local service_type="$1"
local command_name="$2"
shift 2
- local service_name=$service_type
+ local service_name=""
local all_flag=false
# Check and see if accumulo-cluster is calling this script
- if [[ -z $ACCUMULO_SERVICE_INSTANCE ]]; then
+ if [[ -z $ACCUMULO_CLUSTER_ARG ]]; then
# The rest of the arguments are from a user
if [[ $1 == "--all" ]]; then
all_flag=true
@@ -212,9 +270,6 @@ function main() {
service_name="$1"
fi
fi
- # Use the special bash env var from accumulo-cluster
- else
- service_name="${service_type}${ACCUMULO_SERVICE_INSTANCE}"
fi
case "$service_type" in
@@ -227,10 +282,10 @@ function main() {
start_service "$service_type" "$service_name" "$@"
;;
stop)
- stop_service "$service_type" "$service_name" $all_flag
+ stop_service "$service_type" "$service_name" $all_flag "$@"
;;
kill)
- kill_service "$service_type" "$service_name" $all_flag
+ kill_service "$service_type" "$service_name" $all_flag "$@"
;;
list)
list_processes "$service_type"
diff --git a/assemble/conf/accumulo-env.sh b/assemble/conf/accumulo-env.sh
index 96a6e25c6c..7bdc570380 100644
--- a/assemble/conf/accumulo-env.sh
+++ b/assemble/conf/accumulo-env.sh
@@ -101,10 +101,10 @@ esac
## JVM options set for logging. Review log4j2.properties file to see how they
are used.
JAVA_OPTS=("-Daccumulo.log.dir=${ACCUMULO_LOG_DIR}"
- "-Daccumulo.application=${cmd}${ACCUMULO_SERVICE_INSTANCE}_$(hostname)"
- "-Daccumulo.metrics.service.instance=${cmd}${ACCUMULO_SERVICE_INSTANCE}"
+ "-Daccumulo.application=${ACCUMULO_SERVICE_INSTANCE}_$(hostname)"
+ "-Daccumulo.metrics.service.instance=${ACCUMULO_SERVICE_INSTANCE}"
"-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
- "-Dotel.service.name=${cmd}${ACCUMULO_SERVICE_INSTANCE}"
+ "-Dotel.service.name=${ACCUMULO_SERVICE_INSTANCE}"
"${JAVA_OPTS[@]}"
)
