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 5607826230 Added ability for user to provide resource group overrides
(#5111)
5607826230 is described below
commit 5607826230ad27a02d0169f65061c83eb260d2cd
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Tue Nov 26 08:01:18 2024 -0500
Added ability for user to provide resource group overrides (#5111)
Added per-resource group environment files that allows the user
to provide JVM options and Accumulo property overrides
Co-authored-by: Daniel Roberts <ddani...@gmail.com>
---
assemble/bin/accumulo-service | 17 +++++++-
assemble/conf/default-group-env.sh | 80 ++++++++++++++++++++++++++++++++++++++
2 files changed, 96 insertions(+), 1 deletion(-)
diff --git a/assemble/bin/accumulo-service b/assemble/bin/accumulo-service
index 6181ef9a62..ea77129fe2 100755
--- a/assemble/bin/accumulo-service
+++ b/assemble/bin/accumulo-service
@@ -70,6 +70,15 @@ function get_group() {
echo "${group}"
}
+function get_group_overrides() {
+ service="$1"
+ group="$2"
+ if [[ -f "${conf}/${group}-group-env.sh" ]]; then
+ #shellcheck source=../conf/default-group-env.sh
+ source "${conf}/${group}-group-env.sh" "${service}"
+ fi
+}
+
function start_service() {
local service_type=$1
local service_name=$2
@@ -86,6 +95,12 @@ function start_service() {
group=$(get_group "$@")
+ #
+ # Get any resource group overrides, this should
+ # export ACCUMULO_JAVA_OPTS and PROPERTY_OVERRIDES
+ #
+ get_group_overrides "$service_type" "$group"
+
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}"
@@ -113,7 +128,7 @@ function start_service() {
rotate_log "$outfile"
rotate_log "$errfile"
- nohup "${bin}/accumulo" "$service_type" "$@" >"$outfile" 2>"$errfile"
</dev/null &
+ nohup "${bin}/accumulo" "$service_type" "$@" "${PROPERTY_OVERRIDES[@]}"
>"$outfile" 2>"$errfile" </dev/null &
echo "$!" >"${pid_file}"
done
diff --git a/assemble/conf/default-group-env.sh
b/assemble/conf/default-group-env.sh
new file mode 100644
index 0000000000..a1a46260da
--- /dev/null
+++ b/assemble/conf/default-group-env.sh
@@ -0,0 +1,80 @@
+#! /usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# This script is called from accumulo-service and serves as a mechanism to set
+# ACCUMULO_JAVA_OPTS and provide property overrides for the server processes in
+# a resource group. This allows the user to set a base configuration in
+# accumulo-env.sh and accumulo.properties and then tailor the configuration of
+# the individual processes in a resource group. For example, when you have a
+# cluster comprised of sets of servers with different amounts of memory, then
+# the user can set default JVM heap settings in accumulo-env.sh, and then
+# increase or decrease in this file.
+#
+# This script will export ACCUMULO_JAVA_OPTS and PROPERTY_OVERRIDES variables
+# based on the service type for the default resource group. Additional files
can
+# be created based on the groups configured in cluster.yaml and should be named
+# "{groupName}-group-env.sh". The contents of ACCUMULO_JAVA_OPTS will be
appended
+# to the JAVA_OPTS variable that is created in accumulo-env.sh, allowing the
user
+# to override any setting for this resource group. Likewise, the contents of
+# PROPERTY_OVERRIDES will be appended to the arguments provided to the server
+# class allowing the user to override any Accumulo property for this resource
group.
+# Overriding the bind address and group name properties would not be advisable
as
+# this could lead to deployment issues.
+
+# Examples:
+#
+# Override JVM args
+# export ACCUMULO_JAVA_OPTS="-Xms1024m -Xmx1024m"
+#
+# Override Accumulo properties
+# export PROPERTY_OVERRIDES=('-o' 'rpc.backlog=1000' '-o'
'tserver.hold.time.max=10m')
+
+service=$1
+
+case "$service" in
+ manager)
+ export ACCUMULO_JAVA_OPTS=""
+ export PROPERTY_OVERRIDES=()
+ ;;
+ monitor)
+ export ACCUMULO_JAVA_OPTS=""
+ export PROPERTY_OVERRIDES=()
+ ;;
+ gc)
+ export ACCUMULO_JAVA_OPTS=""
+ export PROPERTY_OVERRIDES=()
+ ;;
+ tserver)
+ export ACCUMULO_JAVA_OPTS=""
+ export PROPERTY_OVERRIDES=()
+ ;;
+ compactor)
+ export ACCUMULO_JAVA_OPTS=""
+ export PROPERTY_OVERRIDES=()
+ ;;
+ sserver)
+ export ACCUMULO_JAVA_OPTS=""
+ export PROPERTY_OVERRIDES=()
+ ;;
+ *)
+ export ACCUMULO_JAVA_OPTS=""
+ export PROPERTY_OVERRIDES=()
+ ;;
+esac
