diff options
Diffstat (limited to 'client/go/internal/admin/vespa-wrapper/services')
6 files changed, 21 insertions, 21 deletions
diff --git a/client/go/internal/admin/vespa-wrapper/services/configproxy.go b/client/go/internal/admin/vespa-wrapper/services/configproxy.go index e96ee38dcb5..bed6e980cf4 100644 --- a/client/go/internal/admin/vespa-wrapper/services/configproxy.go +++ b/client/go/internal/admin/vespa-wrapper/services/configproxy.go @@ -15,7 +15,7 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/envvars" "github.com/vespa-engine/vespa/client/go/internal/admin/jvm" "github.com/vespa-engine/vespa/client/go/internal/admin/trace" - "github.com/vespa-engine/vespa/client/go/internal/util" + "github.com/vespa-engine/vespa/client/go/internal/osutil" "github.com/vespa-engine/vespa/client/go/internal/vespa" ) @@ -30,9 +30,9 @@ func JustRunConfigproxy() int { vespa.CheckCorrectUser() configsources := defaults.VespaConfigserverRpcAddrs() if len(configsources) < 1 { - util.ExitMsg("could not find any configservers") + osutil.ExitMsg("could not find any configservers") } - util.TuneResourceLimits() + osutil.TuneResourceLimits() c := jvm.NewConfigProxyJvm(PROXY_SERVICE_NAME) userargs := os.Getenv(envvars.VESPA_CONFIGPROXY_JVMARGS) c.ConfigureOptions(configsources, userargs) @@ -68,7 +68,7 @@ func startProxyWithRunserver() { func waitForProxyResponse() bool { hname, _ := vespa.FindOurHostname() - backtick := util.BackTicksWithStderr + backtick := osutil.BackTicksWithStderr start := time.Now() fmt.Printf("Waiting for config proxy to start\n") for sleepcount := 0; sleepcount < 1800; sleepcount++ { @@ -135,7 +135,7 @@ func StartConfigproxy() int { } func stopProxyWithRunserver() { - _, err := util.SystemCommand.Run("vespa-runserver", + _, err := osutil.SystemCommand.Run("vespa-runserver", "-s", PROXY_SERVICE_NAME, "-p", CONFIGPROXY_PIDFILE, "-S") if err != nil { diff --git a/client/go/internal/admin/vespa-wrapper/services/env.go b/client/go/internal/admin/vespa-wrapper/services/env.go index 9a7ba40c73e..23cf80213d5 100644 --- a/client/go/internal/admin/vespa-wrapper/services/env.go +++ b/client/go/internal/admin/vespa-wrapper/services/env.go @@ -8,7 +8,7 @@ import ( "os" "github.com/vespa-engine/vespa/client/go/internal/admin/envvars" - "github.com/vespa-engine/vespa/client/go/internal/util" + "github.com/vespa-engine/vespa/client/go/internal/osutil" ) func exportSettings(vespaHome string) { @@ -21,5 +21,5 @@ func exportSettings(vespaHome string) { os.Setenv(envvars.JAVAVM_LD_PRELOAD, "") os.Setenv(envvars.LD_PRELOAD, "") os.Setenv(envvars.MALLOC_ARENA_MAX, "1") - util.OptionallyReduceTimerFrequency() + osutil.OptionallyReduceTimerFrequency() } diff --git a/client/go/internal/admin/vespa-wrapper/services/prechecks.go b/client/go/internal/admin/vespa-wrapper/services/prechecks.go index 5cba69a4824..93a53707ba2 100644 --- a/client/go/internal/admin/vespa-wrapper/services/prechecks.go +++ b/client/go/internal/admin/vespa-wrapper/services/prechecks.go @@ -8,7 +8,7 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/envvars" "github.com/vespa-engine/vespa/client/go/internal/admin/trace" - "github.com/vespa-engine/vespa/client/go/internal/util" + "github.com/vespa-engine/vespa/client/go/internal/osutil" "github.com/vespa-engine/vespa/client/go/internal/vespa" ) @@ -31,7 +31,7 @@ func commonPreChecks() (veHome, veHost string) { } err = os.Chdir(veHome) if err != nil { - util.ExitErr(err) + osutil.ExitErr(err) } return } diff --git a/client/go/internal/admin/vespa-wrapper/services/sentinel.go b/client/go/internal/admin/vespa-wrapper/services/sentinel.go index 7694c930731..e489bf70ded 100644 --- a/client/go/internal/admin/vespa-wrapper/services/sentinel.go +++ b/client/go/internal/admin/vespa-wrapper/services/sentinel.go @@ -13,7 +13,7 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/envvars" "github.com/vespa-engine/vespa/client/go/internal/admin/trace" - "github.com/vespa-engine/vespa/client/go/internal/util" + "github.com/vespa-engine/vespa/client/go/internal/osutil" "github.com/vespa-engine/vespa/client/go/internal/vespa" ) @@ -48,7 +48,7 @@ func startSentinelWithRunserver() { } func waitForSentinelPid() bool { - backtick := util.BackTicksWithStderr + backtick := osutil.BackTicksWithStderr start := time.Now() for sleepcount := 0; sleepcount < 1000; sleepcount++ { time.Sleep(10 * time.Millisecond) @@ -84,7 +84,7 @@ func StartConfigSentinel() int { } func stopSentinelWithRunserver() { - _, err := util.SystemCommand.Run("vespa-runserver", + _, err := osutil.SystemCommand.Run("vespa-runserver", "-s", SENTINEL_SERVICE_NAME, "-p", SENTINEL_PIDFILE, "-S") if err != nil { diff --git a/client/go/internal/admin/vespa-wrapper/services/start.go b/client/go/internal/admin/vespa-wrapper/services/start.go index 408fc196fec..de658264669 100644 --- a/client/go/internal/admin/vespa-wrapper/services/start.go +++ b/client/go/internal/admin/vespa-wrapper/services/start.go @@ -10,7 +10,7 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/envvars" "github.com/vespa-engine/vespa/client/go/internal/admin/trace" - "github.com/vespa-engine/vespa/client/go/internal/util" + "github.com/vespa-engine/vespa/client/go/internal/osutil" "github.com/vespa-engine/vespa/client/go/internal/vespa" ) @@ -33,14 +33,14 @@ func StartServices() int { } func checkjava() { - backticks := util.BackTicksWithStderr + backticks := osutil.BackTicksWithStderr out, err := backticks.Run("java", "-version") if err != nil { trace.Warning("cannot run 'java -version'") - util.ExitErr(err) + osutil.ExitErr(err) } if !strings.Contains(out, "64-Bit Server VM") { - util.ExitErr(fmt.Errorf("java must invoke the 64-bit Java VM, but -version says:\n%s\n", out)) + osutil.ExitErr(fmt.Errorf("java must invoke the 64-bit Java VM, but -version says:\n%s\n", out)) } } @@ -53,7 +53,7 @@ func VespaStartServices() int { trace.Debug("common prechecks ok, running in", home, "on", host) vespa.RunPreStart() trace.Debug("prestart ok") - util.TuneResourceLimits() + osutil.TuneResourceLimits() increase_vm_max_map_count() trace.Debug("resource limits ok") checkjava() @@ -64,7 +64,7 @@ func VespaStartServices() int { drop_caches() err := vespa.MaybeSwitchUser("start-services") if err != nil { - util.ExitErr(err) + osutil.ExitErr(err) } return StartServices() } diff --git a/client/go/internal/admin/vespa-wrapper/services/stop.go b/client/go/internal/admin/vespa-wrapper/services/stop.go index 9fd19e991a3..c4c4787c83a 100644 --- a/client/go/internal/admin/vespa-wrapper/services/stop.go +++ b/client/go/internal/admin/vespa-wrapper/services/stop.go @@ -8,7 +8,7 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/envvars" "github.com/vespa-engine/vespa/client/go/internal/admin/trace" - "github.com/vespa-engine/vespa/client/go/internal/util" + "github.com/vespa-engine/vespa/client/go/internal/osutil" "github.com/vespa-engine/vespa/client/go/internal/vespa" ) @@ -21,11 +21,11 @@ func VespaStopServices() int { } err := vespa.LoadDefaultEnv() if err != nil { - util.ExitErr(err) + osutil.ExitErr(err) } err = vespa.MaybeSwitchUser("vespa-stop-services") if err != nil { - util.ExitErr(err) + osutil.ExitErr(err) } vespa.CheckCorrectUser() trace.Debug("running as correct user") |