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 0e571cafc4 Replace accumulo-cluster get_ip function with hostname -I
(#2888)
0e571cafc4 is described below
commit 0e571cafc4d5c4b6b2af65241541e3a725ec0a5a
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Tue Aug 23 07:04:56 2022 -0400
Replace accumulo-cluster get_ip function with hostname -I (#2888)
get_ip returns a single ip address for the host, but could return
the incorrect one in the case where a host has multiple interfaces.
This commit modifies the logic to use hostname -I instead and checks
to see if the host we are looking for is in the list of returned IPs
Closes #2884
---
assemble/bin/accumulo-cluster | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/assemble/bin/accumulo-cluster b/assemble/bin/accumulo-cluster
index c4b710f0c3..9366337d13 100755
--- a/assemble/bin/accumulo-cluster
+++ b/assemble/bin/accumulo-cluster
@@ -114,15 +114,6 @@ function parse_config {
}
-function get_ip() {
- local ip_addr
- ip_addr=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut
-f1 -d'/')
- if [[ -z $ip_addr ]]; then
- ip_addr=$(getent ahosts "$(hostname -f)" | grep DGRAM | cut -f 1 -d ' ')
- fi
- echo "$ip_addr"
-}
-
function control_service() {
control_cmd="$1"
host="$2"
@@ -139,7 +130,7 @@ function control_service() {
[[ $service == "compactor" ]] &&
ACCUMULO_SERVICE_INSTANCE="${inst_id}_${5}"
[[ $service == "sserver" && ${NUM_SSERVERS:-1} -gt 1 ]] &&
ACCUMULO_SERVICE_INSTANCE=${inst_id}
- if [[ $host == localhost || $host == "$(hostname -s)" || $host ==
"$(hostname -f)" || $host == $(get_ip) ]]; then
+ if [[ $host == localhost || $host == "$(hostname -s)" || $host ==
"$(hostname -f)" || "$(hostname -I)" =~ $host ]]; then
#
# The server processes take arguments (e.g. -p, -o, -q [in the case of
the Compactor]). Always add the -a argument
# using the value of $host
@@ -219,7 +210,7 @@ function start_all() {
function start_here() {
- local_hosts="$(hostname -a 2>/dev/null) $(hostname) localhost 127.0.0.1
$(get_ip)"
+ local_hosts="$(hostname -a 2>/dev/null) $(hostname) localhost 127.0.0.1
$(hostname -I)"
for host in $local_hosts; do
for tserver in $TSERVER_HOSTS; do
