From cc5f5b2b41db293a9ce7ef554adde9e776fd1ad2 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Wed, 9 May 2018 14:00:59 +0000 Subject: update bootstrap section of scripts --- .../src/main/sh/vespa-preprocess-application | 9 +++++++++ .../src/main/sh/fleetcontroller-start | 9 +++++++++ config-model/src/main/perl/vespa-deploy | 12 ++++++++++++ config-model/src/main/sh/vespa-validate-application | 9 +++++++++ config-proxy/src/main/sh/vespa-config-ctl.sh | 9 +++++++++ config-proxy/src/main/sh/vespa-config-loadtester.sh | 9 +++++++++ config-proxy/src/main/sh/vespa-config-verification.sh | 9 +++++++++ .../vespa-activate-application/vespa-activate-application.sh | 9 +++++++++ config/src/apps/vespa-config/vespa-config.pl | 12 ++++++++++++ configgen/bin/make-config.pl | 12 ++++++++++++ configgen/bin/make-configold.pl | 12 ++++++++++++ configserver/src/main/sh/start-configserver | 9 +++++++++ configserver/src/main/sh/start-logd | 9 +++++++++ configserver/src/main/sh/stop-configserver | 9 +++++++++ configserver/src/main/sh/vespa-configserver-remove-state | 9 +++++++++ container-search/src/main/sh/invoke | 9 +++++++++ .../src/main/sh/vespa-status-filedistribution.sh | 9 +++++++++ jdisc_core/src/main/perl/vespa-jdisc-logfmt | 12 ++++++++++++ libmlr/bin/xml2cpp | 9 +++++++++ logserver/bin/logserver-start.sh | 9 +++++++++ node-admin/src/main/sh/node-admin.sh | 9 +++++++++ .../src/apps/vespa-remove-indexes/vespa-remove-index.sh | 9 +++++++++ searchlib/src/main/sh/vespa-gbdt-converter | 9 +++++++++ searchlib/src/main/sh/vespa-treenet-converter | 9 +++++++++ standalone-container/src/main/sh/jdisc_container_start | 9 +++++++++ standalone-container/src/main/sh/standalone-container.sh | 9 +++++++++ vespa_feed_perf/src/main/sh/vespa-feed-perf | 9 +++++++++ vespabase/src/rhel-prestart.sh | 9 +++++++++ vespabase/src/start-cbinaries.sh | 9 +++++++++ vespabase/src/start-tool.sh | 9 +++++++++ vespabase/src/start-vespa-base.sh | 9 +++++++++ vespabase/src/stop-vespa-base.sh | 9 +++++++++ vespabase/src/vespa-start-configserver.sh | 9 +++++++++ vespabase/src/vespa-start-services.sh | 9 +++++++++ vespabase/src/vespa-stop-configserver.sh | 9 +++++++++ vespabase/src/vespa-stop-services.sh | 9 +++++++++ vespaclient-java/src/main/sh/vespa-destination.sh | 9 +++++++++ vespaclient-java/src/main/sh/vespa-document-statistics.sh | 9 +++++++++ vespaclient-java/src/main/sh/vespa-feeder.sh | 9 +++++++++ vespaclient-java/src/main/sh/vespa-get.sh | 9 +++++++++ .../src/main/sh/vespa-query-profile-dump-tool.sh | 9 +++++++++ vespaclient-java/src/main/sh/vespa-stat.sh | 9 +++++++++ vespaclient-java/src/main/sh/vespa-summary-benchmark.sh | 9 +++++++++ vespaclient-java/src/main/sh/vespa-visit-target.sh | 9 +++++++++ vespaclient-java/src/main/sh/vespa-visit.sh | 9 +++++++++ vespaclient/src/perl/bin/GetClusterState.pl | 12 ++++++++++++ vespaclient/src/perl/bin/GetNodeState.pl | 12 ++++++++++++ vespaclient/src/perl/bin/SetNodeState.pl | 12 ++++++++++++ vespalog/src/vespa-logfmt/vespa-logfmt.pl | 12 ++++++++++++ zkfacade/src/main/sh/zkcat | 9 +++++++++ zkfacade/src/main/sh/zkcli | 9 +++++++++ zkfacade/src/main/sh/zkctl | 9 +++++++++ zkfacade/src/main/sh/zkls | 9 +++++++++ 53 files changed, 504 insertions(+) diff --git a/application-preprocessor/src/main/sh/vespa-preprocess-application b/application-preprocessor/src/main/sh/vespa-preprocess-application index b238af04e3b..0912f3720f4 100644 --- a/application-preprocessor/src/main/sh/vespa-preprocess-application +++ b/application-preprocessor/src/main/sh/vespa-preprocess-application @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/clustercontroller-standalone/src/main/sh/fleetcontroller-start b/clustercontroller-standalone/src/main/sh/fleetcontroller-start index 647480e5e17..0cf0a9b0f88 100755 --- a/clustercontroller-standalone/src/main/sh/fleetcontroller-start +++ b/clustercontroller-standalone/src/main/sh/fleetcontroller-start @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/config-model/src/main/perl/vespa-deploy b/config-model/src/main/perl/vespa-deploy index 8a74d97e868..f13846332c6 100755 --- a/config-model/src/main/perl/vespa-deploy +++ b/config-model/src/main/perl/vespa-deploy @@ -54,9 +54,21 @@ sub findhome { die "FATAL: Missing VESPA_HOME environment variable\n"; } +sub findhost { + $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'}; + my $tmp = $ENV{'VESPA_HOSTNAME'}; + if (!defined $tmp) { + $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n"; + } + system("vespa-validate-hostname $tmp"); + ( $? == 0 ) or die "Could not validate hostname\n"; +} + BEGIN { my $tmp = findhome(); $ENV{'VESPA_HOME'} = $tmp; + $tmp = findhost(); + $ENV{'VESPA_HOSTNAME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/config-model/src/main/sh/vespa-validate-application b/config-model/src/main/sh/vespa-validate-application index 6bbd5bd9976..a399fad63be 100755 --- a/config-model/src/main/sh/vespa-validate-application +++ b/config-model/src/main/sh/vespa-validate-application @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh index 407b3179a88..6c92bf3c3b2 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl.sh +++ b/config-proxy/src/main/sh/vespa-config-ctl.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/config-proxy/src/main/sh/vespa-config-loadtester.sh b/config-proxy/src/main/sh/vespa-config-loadtester.sh index fc0a33d8d49..5122d74f59c 100644 --- a/config-proxy/src/main/sh/vespa-config-loadtester.sh +++ b/config-proxy/src/main/sh/vespa-config-loadtester.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/config-proxy/src/main/sh/vespa-config-verification.sh b/config-proxy/src/main/sh/vespa-config-verification.sh index 52174495ee3..584129f686d 100644 --- a/config-proxy/src/main/sh/vespa-config-verification.sh +++ b/config-proxy/src/main/sh/vespa-config-verification.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/config/src/apps/vespa-activate-application/vespa-activate-application.sh b/config/src/apps/vespa-activate-application/vespa-activate-application.sh index e94b5b5f11e..9eb95cc6290 100644 --- a/config/src/apps/vespa-activate-application/vespa-activate-application.sh +++ b/config/src/apps/vespa-activate-application/vespa-activate-application.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/config/src/apps/vespa-config/vespa-config.pl b/config/src/apps/vespa-config/vespa-config.pl index 735a8054f52..d43016331f4 100755 --- a/config/src/apps/vespa-config/vespa-config.pl +++ b/config/src/apps/vespa-config/vespa-config.pl @@ -54,9 +54,21 @@ sub findhome { die "FATAL: Missing VESPA_HOME environment variable\n"; } +sub findhost { + $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'}; + my $tmp = $ENV{'VESPA_HOSTNAME'}; + if (!defined $tmp) { + $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n"; + } + system("vespa-validate-hostname $tmp"); + ( $? == 0 ) or die "Could not validate hostname\n"; +} + BEGIN { my $tmp = findhome(); $ENV{'VESPA_HOME'} = $tmp; + $tmp = findhost(); + $ENV{'VESPA_HOSTNAME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/configgen/bin/make-config.pl b/configgen/bin/make-config.pl index 2919e9b004a..0e116f5eb45 100755 --- a/configgen/bin/make-config.pl +++ b/configgen/bin/make-config.pl @@ -61,9 +61,21 @@ sub findhome { die "FATAL: Missing VESPA_HOME environment variable\n"; } +sub findhost { + $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'}; + my $tmp = $ENV{'VESPA_HOSTNAME'}; + if (!defined $tmp) { + $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n"; + } + system("vespa-validate-hostname $tmp"); + ( $? == 0 ) or die "Could not validate hostname\n"; +} + BEGIN { my $tmp = findhome(); $ENV{'VESPA_HOME'} = $tmp; + $tmp = findhost(); + $ENV{'VESPA_HOSTNAME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/configgen/bin/make-configold.pl b/configgen/bin/make-configold.pl index 8e8c92377da..dcba0a02a6d 100755 --- a/configgen/bin/make-configold.pl +++ b/configgen/bin/make-configold.pl @@ -61,9 +61,21 @@ sub findhome { die "FATAL: Missing VESPA_HOME environment variable\n"; } +sub findhost { + $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'}; + my $tmp = $ENV{'VESPA_HOSTNAME'}; + if (!defined $tmp) { + $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n"; + } + system("vespa-validate-hostname $tmp"); + ( $? == 0 ) or die "Could not validate hostname\n"; +} + BEGIN { my $tmp = findhome(); $ENV{'VESPA_HOME'} = $tmp; + $tmp = findhost(); + $ENV{'VESPA_HOSTNAME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index f4b59e2b49d..8c0ea810a9a 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index 848d8dee6aa..ce0b60a8d8d 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver index 15ac6023a91..957fdb249c3 100755 --- a/configserver/src/main/sh/stop-configserver +++ b/configserver/src/main/sh/stop-configserver @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/configserver/src/main/sh/vespa-configserver-remove-state b/configserver/src/main/sh/vespa-configserver-remove-state index c781fcb0c0d..e3d348ecefa 100755 --- a/configserver/src/main/sh/vespa-configserver-remove-state +++ b/configserver/src/main/sh/vespa-configserver-remove-state @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/container-search/src/main/sh/invoke b/container-search/src/main/sh/invoke index f53b6cc4538..04c145ef035 100755 --- a/container-search/src/main/sh/invoke +++ b/container-search/src/main/sh/invoke @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/filedistribution/src/main/sh/vespa-status-filedistribution.sh b/filedistribution/src/main/sh/vespa-status-filedistribution.sh index 119999c9191..2a232abb909 100644 --- a/filedistribution/src/main/sh/vespa-status-filedistribution.sh +++ b/filedistribution/src/main/sh/vespa-status-filedistribution.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/jdisc_core/src/main/perl/vespa-jdisc-logfmt b/jdisc_core/src/main/perl/vespa-jdisc-logfmt index 4d66dda027e..dcada283fc9 100755 --- a/jdisc_core/src/main/perl/vespa-jdisc-logfmt +++ b/jdisc_core/src/main/perl/vespa-jdisc-logfmt @@ -52,9 +52,21 @@ sub findhome { die "FATAL: Missing VESPA_HOME environment variable\n"; } +sub findhost { + $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'}; + my $tmp = $ENV{'VESPA_HOSTNAME'}; + if (!defined $tmp) { + $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n"; + } + system("vespa-validate-hostname $tmp"); + ( $? == 0 ) or die "Could not validate hostname\n"; +} + BEGIN { my $tmp = findhome(); $ENV{'VESPA_HOME'} = $tmp; + $tmp = findhost(); + $ENV{'VESPA_HOSTNAME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/libmlr/bin/xml2cpp b/libmlr/bin/xml2cpp index 05ae9b9d933..093ee88b8bc 100755 --- a/libmlr/bin/xml2cpp +++ b/libmlr/bin/xml2cpp @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh index bc3270499fd..0b26d3cbb1c 100755 --- a/logserver/bin/logserver-start.sh +++ b/logserver/bin/logserver-start.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/node-admin/src/main/sh/node-admin.sh b/node-admin/src/main/sh/node-admin.sh index b2dac920c56..3cff2a636c2 100755 --- a/node-admin/src/main/sh/node-admin.sh +++ b/node-admin/src/main/sh/node-admin.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh b/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh index 7200a7c95af..4d3fbb23d95 100755 --- a/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh +++ b/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/searchlib/src/main/sh/vespa-gbdt-converter b/searchlib/src/main/sh/vespa-gbdt-converter index 7f754635ac8..7b7b2b67482 100755 --- a/searchlib/src/main/sh/vespa-gbdt-converter +++ b/searchlib/src/main/sh/vespa-gbdt-converter @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/searchlib/src/main/sh/vespa-treenet-converter b/searchlib/src/main/sh/vespa-treenet-converter index f8a3201e1f7..2d892f89829 100755 --- a/searchlib/src/main/sh/vespa-treenet-converter +++ b/searchlib/src/main/sh/vespa-treenet-converter @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/standalone-container/src/main/sh/jdisc_container_start b/standalone-container/src/main/sh/jdisc_container_start index 5fb4642a21d..a41913326d7 100755 --- a/standalone-container/src/main/sh/jdisc_container_start +++ b/standalone-container/src/main/sh/jdisc_container_start @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index c5747faf0d5..8af36a98ab4 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespa_feed_perf/src/main/sh/vespa-feed-perf b/vespa_feed_perf/src/main/sh/vespa-feed-perf index d1dcead7be6..b91e025bef9 100755 --- a/vespa_feed_perf/src/main/sh/vespa-feed-perf +++ b/vespa_feed_perf/src/main/sh/vespa-feed-perf @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index 2523446639b..13c244768f8 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh index 341bce0e192..08197304378 100755 --- a/vespabase/src/start-cbinaries.sh +++ b/vespabase/src/start-cbinaries.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespabase/src/start-tool.sh b/vespabase/src/start-tool.sh index 4a2ddbb61cf..7c7b26db768 100755 --- a/vespabase/src/start-tool.sh +++ b/vespabase/src/start-tool.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespabase/src/start-vespa-base.sh b/vespabase/src/start-vespa-base.sh index 096c63f9969..48518291c83 100755 --- a/vespabase/src/start-vespa-base.sh +++ b/vespabase/src/start-vespa-base.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespabase/src/stop-vespa-base.sh b/vespabase/src/stop-vespa-base.sh index dde1cb880b0..e25c251dd75 100755 --- a/vespabase/src/stop-vespa-base.sh +++ b/vespabase/src/stop-vespa-base.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh index 38a4249982e..7d717c4b1dc 100755 --- a/vespabase/src/vespa-start-configserver.sh +++ b/vespabase/src/vespa-start-configserver.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespabase/src/vespa-start-services.sh b/vespabase/src/vespa-start-services.sh index fbc110dbdee..90a9667e402 100755 --- a/vespabase/src/vespa-start-services.sh +++ b/vespabase/src/vespa-start-services.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespabase/src/vespa-stop-configserver.sh b/vespabase/src/vespa-stop-configserver.sh index 33532744ae3..88eefd38f3b 100755 --- a/vespabase/src/vespa-stop-configserver.sh +++ b/vespabase/src/vespa-stop-configserver.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespabase/src/vespa-stop-services.sh b/vespabase/src/vespa-stop-services.sh index 8d519a5fa9e..2ca245b2c93 100755 --- a/vespabase/src/vespa-stop-services.sh +++ b/vespabase/src/vespa-stop-services.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient-java/src/main/sh/vespa-destination.sh b/vespaclient-java/src/main/sh/vespa-destination.sh index b5689ffd994..00171806b69 100755 --- a/vespaclient-java/src/main/sh/vespa-destination.sh +++ b/vespaclient-java/src/main/sh/vespa-destination.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient-java/src/main/sh/vespa-document-statistics.sh b/vespaclient-java/src/main/sh/vespa-document-statistics.sh index 9bac0c0047b..16b7e1f1b37 100755 --- a/vespaclient-java/src/main/sh/vespa-document-statistics.sh +++ b/vespaclient-java/src/main/sh/vespa-document-statistics.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient-java/src/main/sh/vespa-feeder.sh b/vespaclient-java/src/main/sh/vespa-feeder.sh index e322fb897c2..ff45587b9fc 100755 --- a/vespaclient-java/src/main/sh/vespa-feeder.sh +++ b/vespaclient-java/src/main/sh/vespa-feeder.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient-java/src/main/sh/vespa-get.sh b/vespaclient-java/src/main/sh/vespa-get.sh index 552379617e2..d6a9108fedd 100644 --- a/vespaclient-java/src/main/sh/vespa-get.sh +++ b/vespaclient-java/src/main/sh/vespa-get.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh b/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh index 79d432bc883..031034f9371 100755 --- a/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh +++ b/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient-java/src/main/sh/vespa-stat.sh b/vespaclient-java/src/main/sh/vespa-stat.sh index 3c1eab6c6e3..08d87685b67 100644 --- a/vespaclient-java/src/main/sh/vespa-stat.sh +++ b/vespaclient-java/src/main/sh/vespa-stat.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh index 83f019b8db1..555fdc464c6 100755 --- a/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh +++ b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient-java/src/main/sh/vespa-visit-target.sh b/vespaclient-java/src/main/sh/vespa-visit-target.sh index fb5aa908232..72d4aac120b 100755 --- a/vespaclient-java/src/main/sh/vespa-visit-target.sh +++ b/vespaclient-java/src/main/sh/vespa-visit-target.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient-java/src/main/sh/vespa-visit.sh b/vespaclient-java/src/main/sh/vespa-visit.sh index e029cb0b429..b84a906f41e 100755 --- a/vespaclient-java/src/main/sh/vespa-visit.sh +++ b/vespaclient-java/src/main/sh/vespa-visit.sh @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/vespaclient/src/perl/bin/GetClusterState.pl b/vespaclient/src/perl/bin/GetClusterState.pl index 6dd36d9e131..e3528fff039 100755 --- a/vespaclient/src/perl/bin/GetClusterState.pl +++ b/vespaclient/src/perl/bin/GetClusterState.pl @@ -52,9 +52,21 @@ sub findhome { die "FATAL: Missing VESPA_HOME environment variable\n"; } +sub findhost { + $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'}; + my $tmp = $ENV{'VESPA_HOSTNAME'}; + if (!defined $tmp) { + $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n"; + } + system("vespa-validate-hostname $tmp"); + ( $? == 0 ) or die "Could not validate hostname\n"; +} + BEGIN { my $tmp = findhome(); $ENV{'VESPA_HOME'} = $tmp; + $tmp = findhost(); + $ENV{'VESPA_HOSTNAME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/vespaclient/src/perl/bin/GetNodeState.pl b/vespaclient/src/perl/bin/GetNodeState.pl index f7ac5a24918..28f3cf99b1f 100755 --- a/vespaclient/src/perl/bin/GetNodeState.pl +++ b/vespaclient/src/perl/bin/GetNodeState.pl @@ -52,9 +52,21 @@ sub findhome { die "FATAL: Missing VESPA_HOME environment variable\n"; } +sub findhost { + $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'}; + my $tmp = $ENV{'VESPA_HOSTNAME'}; + if (!defined $tmp) { + $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n"; + } + system("vespa-validate-hostname $tmp"); + ( $? == 0 ) or die "Could not validate hostname\n"; +} + BEGIN { my $tmp = findhome(); $ENV{'VESPA_HOME'} = $tmp; + $tmp = findhost(); + $ENV{'VESPA_HOSTNAME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/vespaclient/src/perl/bin/SetNodeState.pl b/vespaclient/src/perl/bin/SetNodeState.pl index f5df40a2433..91ceeea2c1b 100755 --- a/vespaclient/src/perl/bin/SetNodeState.pl +++ b/vespaclient/src/perl/bin/SetNodeState.pl @@ -52,9 +52,21 @@ sub findhome { die "FATAL: Missing VESPA_HOME environment variable\n"; } +sub findhost { + $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'}; + my $tmp = $ENV{'VESPA_HOSTNAME'}; + if (!defined $tmp) { + $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n"; + } + system("vespa-validate-hostname $tmp"); + ( $? == 0 ) or die "Could not validate hostname\n"; +} + BEGIN { my $tmp = findhome(); $ENV{'VESPA_HOME'} = $tmp; + $tmp = findhost(); + $ENV{'VESPA_HOSTNAME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/vespalog/src/vespa-logfmt/vespa-logfmt.pl b/vespalog/src/vespa-logfmt/vespa-logfmt.pl index 725396c9458..1129c0a4d5b 100755 --- a/vespalog/src/vespa-logfmt/vespa-logfmt.pl +++ b/vespalog/src/vespa-logfmt/vespa-logfmt.pl @@ -52,9 +52,21 @@ sub findhome { die "FATAL: Missing VESPA_HOME environment variable\n"; } +sub findhost { + $ENV{'PATH'} = $ENV{'VESPA_HOME'} . '/bin:' . $ENV{'PATH'}; + my $tmp = $ENV{'VESPA_HOSTNAME'}; + if (!defined $tmp) { + $tmp = `vespa-detect-hostname` or die "Could not detect hostname\n"; + } + system("vespa-validate-hostname $tmp"); + ( $? == 0 ) or die "Could not validate hostname\n"; +} + BEGIN { my $tmp = findhome(); $ENV{'VESPA_HOME'} = $tmp; + $tmp = findhost(); + $ENV{'VESPA_HOSTNAME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/zkfacade/src/main/sh/zkcat b/zkfacade/src/main/sh/zkcat index 2504b77d085..b9de9364836 100755 --- a/zkfacade/src/main/sh/zkcat +++ b/zkfacade/src/main/sh/zkcat @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/zkfacade/src/main/sh/zkcli b/zkfacade/src/main/sh/zkcli index d0c88e6932a..67866274709 100755 --- a/zkfacade/src/main/sh/zkcli +++ b/zkfacade/src/main/sh/zkcli @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/zkfacade/src/main/sh/zkctl b/zkfacade/src/main/sh/zkctl index a4e3b106229..fe0a257baa0 100755 --- a/zkfacade/src/main/sh/zkctl +++ b/zkfacade/src/main/sh/zkctl @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section diff --git a/zkfacade/src/main/sh/zkls b/zkfacade/src/main/sh/zkls index ccd2e546252..a7c95eee224 100755 --- a/zkfacade/src/main/sh/zkls +++ b/zkfacade/src/main/sh/zkls @@ -54,7 +54,16 @@ findroot () { exit 1 } +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + fi + vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 + export VESPA_HOSTNAME +} + findroot +findhost # END environment bootstrap section -- cgit v1.2.3