aboutsummaryrefslogtreecommitdiffstats
path: root/client/go/internal/admin/jvm
diff options
context:
space:
mode:
Diffstat (limited to 'client/go/internal/admin/jvm')
-rw-r--r--client/go/internal/admin/jvm/application_container.go4
-rw-r--r--client/go/internal/admin/jvm/container.go4
-rw-r--r--client/go/internal/admin/jvm/env.go4
-rw-r--r--client/go/internal/admin/jvm/mem_avail.go4
-rw-r--r--client/go/internal/admin/jvm/options.go8
-rw-r--r--client/go/internal/admin/jvm/properties.go4
-rw-r--r--client/go/internal/admin/jvm/qr_start_cfg.go6
-rw-r--r--client/go/internal/admin/jvm/standalone_container.go4
-rw-r--r--client/go/internal/admin/jvm/zk_locks.go6
9 files changed, 22 insertions, 22 deletions
diff --git a/client/go/internal/admin/jvm/application_container.go b/client/go/internal/admin/jvm/application_container.go
index 37f9bccd1ff..3806dfea302 100644
--- a/client/go/internal/admin/jvm/application_container.go
+++ b/client/go/internal/admin/jvm/application_container.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/prog"
"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"
)
const (
@@ -177,6 +177,6 @@ func (c *ApplicationContainer) exportExtraEnv(ps *prog.Spec) {
if c.ConfigId() != "" {
ps.Setenv(envvars.VESPA_CONFIG_ID, c.ConfigId())
} else {
- util.ExitMsg("application container requires a config id")
+ osutil.ExitMsg("application container requires a config id")
}
}
diff --git a/client/go/internal/admin/jvm/container.go b/client/go/internal/admin/jvm/container.go
index 5384a6c1ea5..852bdb2464b 100644
--- a/client/go/internal/admin/jvm/container.go
+++ b/client/go/internal/admin/jvm/container.go
@@ -11,7 +11,7 @@ import (
"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
"github.com/vespa-engine/vespa/client/go/internal/list"
- "github.com/vespa-engine/vespa/client/go/internal/util"
+ "github.com/vespa-engine/vespa/client/go/internal/osutil"
)
type Container interface {
@@ -72,5 +72,5 @@ func (cb *containerBase) Exec() {
trace.Info("JVM env:", readableEnv(p.Env))
trace.Info("JVM exec:", argv)
err := p.Run()
- util.ExitErr(err)
+ osutil.ExitErr(err)
}
diff --git a/client/go/internal/admin/jvm/env.go b/client/go/internal/admin/jvm/env.go
index 6fcd39a5a1b..ab7b005668b 100644
--- a/client/go/internal/admin/jvm/env.go
+++ b/client/go/internal/admin/jvm/env.go
@@ -12,7 +12,7 @@ import (
"github.com/vespa-engine/vespa/client/go/internal/admin/prog"
"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
"github.com/vespa-engine/vespa/client/go/internal/ioutil"
- "github.com/vespa-engine/vespa/client/go/internal/util"
+ "github.com/vespa-engine/vespa/client/go/internal/osutil"
)
func (opts *Options) exportEnvSettings(ps *prog.Spec) {
@@ -46,6 +46,6 @@ func (opts *Options) exportEnvSettings(ps *prog.Spec) {
ps.Setenv(envvars.LD_PRELOAD, preload)
}
}
- util.OptionallyReduceTimerFrequency()
+ osutil.OptionallyReduceTimerFrequency()
c.exportExtraEnv(ps)
}
diff --git a/client/go/internal/admin/jvm/mem_avail.go b/client/go/internal/admin/jvm/mem_avail.go
index bcc475e8ba8..df5acf79043 100644
--- a/client/go/internal/admin/jvm/mem_avail.go
+++ b/client/go/internal/admin/jvm/mem_avail.go
@@ -10,7 +10,7 @@ import (
"strings"
"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"
)
func parseFree(txt string) AmountOfMemory {
@@ -91,7 +91,7 @@ func vespa_cg2get_impl(rootdir, limitname string) (output string, err error) {
func getAvailableMemory() AmountOfMemory {
result := BytesOfMemory(0)
- backticks := util.BackTicksWithStderr
+ backticks := osutil.BackTicksWithStderr
freeOutput, err := backticks.Run("free", "-m")
if err == nil {
result = parseFree(freeOutput)
diff --git a/client/go/internal/admin/jvm/options.go b/client/go/internal/admin/jvm/options.go
index 3a1a508114a..30c07526a40 100644
--- a/client/go/internal/admin/jvm/options.go
+++ b/client/go/internal/admin/jvm/options.go
@@ -11,7 +11,7 @@ import (
"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
"github.com/vespa-engine/vespa/client/go/internal/admin/trace"
"github.com/vespa-engine/vespa/client/go/internal/list"
- "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,12 +21,12 @@ type Options struct {
jvmArgs list.ArrayList[string]
mainClass string
jarWithDeps string
- fixSpec util.FixSpec
+ fixSpec osutil.FixSpec
}
func NewOptions(c Container) *Options {
vespaUid, vespaGid := vespa.FindVespaUidAndGid()
- fixSpec := util.FixSpec{
+ fixSpec := osutil.FixSpec{
UserId: vespaUid,
GroupId: vespaGid,
DirMode: 0755,
@@ -80,7 +80,7 @@ func (opts *Options) AddJvmArgsFromString(args string) {
func (opts *Options) ConfigureCpuCount(cnt int) {
if cnt <= 0 {
- out, err := util.BackTicksForwardStderr.Run("nproc", "--all")
+ out, err := osutil.BackTicksForwardStderr.Run("nproc", "--all")
if err != nil {
trace.Trace("failed nproc:", err)
} else {
diff --git a/client/go/internal/admin/jvm/properties.go b/client/go/internal/admin/jvm/properties.go
index 367de49d6c9..d0016e03b51 100644
--- a/client/go/internal/admin/jvm/properties.go
+++ b/client/go/internal/admin/jvm/properties.go
@@ -11,7 +11,7 @@ import (
"strings"
"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"
)
// quote as specified in JDK source file java.base/share/classes/java/util/Properties.java
@@ -101,6 +101,6 @@ func writeEnvAsProperties(envv []string, propsFile string) {
trace.Trace("write props file:", propsFile)
err := os.WriteFile(propsFile, envAsProperties(envv), 0600)
if err != nil {
- util.ExitErr(err)
+ osutil.ExitErr(err)
}
}
diff --git a/client/go/internal/admin/jvm/qr_start_cfg.go b/client/go/internal/admin/jvm/qr_start_cfg.go
index 7177c4c1a2f..a14ab0d1946 100644
--- a/client/go/internal/admin/jvm/qr_start_cfg.go
+++ b/client/go/internal/admin/jvm/qr_start_cfg.go
@@ -8,7 +8,7 @@ import (
"strings"
"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"
)
type QrStartConfig struct {
@@ -42,10 +42,10 @@ func (a *ApplicationContainer) getQrStartCfg() *QrStartConfig {
"-n", "search.config.qr-start",
"-i", a.ConfigId(),
}
- backticks := util.BackTicksForwardStderr
+ backticks := osutil.BackTicksForwardStderr
data, err := backticks.Run("vespa-get-config", args...)
if err != nil {
- util.ExitMsg("could not get qr-start config: " + err.Error())
+ osutil.ExitMsg("could not get qr-start config: " + err.Error())
} else {
codec := json.NewDecoder(strings.NewReader(data))
err = codec.Decode(&parsedJson)
diff --git a/client/go/internal/admin/jvm/standalone_container.go b/client/go/internal/admin/jvm/standalone_container.go
index 23f712851ff..20031bc7725 100644
--- a/client/go/internal/admin/jvm/standalone_container.go
+++ b/client/go/internal/admin/jvm/standalone_container.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/prog"
"github.com/vespa-engine/vespa/client/go/internal/ioutil"
- "github.com/vespa-engine/vespa/client/go/internal/util"
+ "github.com/vespa-engine/vespa/client/go/internal/osutil"
)
const (
@@ -82,6 +82,6 @@ func (c *StandaloneContainer) exportExtraEnv(ps *prog.Spec) {
if ioutil.IsDir(app) {
ps.Setenv(envvars.STANDALONE_JDISC_APP_LOCATION, app)
} else {
- util.ExitMsg("standalone container requires an application directory, missing: " + app)
+ osutil.ExitMsg("standalone container requires an application directory, missing: " + app)
}
}
diff --git a/client/go/internal/admin/jvm/zk_locks.go b/client/go/internal/admin/jvm/zk_locks.go
index 0a307c5a38a..3f0c8ea3301 100644
--- a/client/go/internal/admin/jvm/zk_locks.go
+++ b/client/go/internal/admin/jvm/zk_locks.go
@@ -8,7 +8,7 @@ import (
"github.com/vespa-engine/vespa/client/go/internal/admin/defaults"
"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"
)
const (
@@ -16,12 +16,12 @@ const (
)
func RemoveStaleZkLocks(c Container) {
- backticks := util.BackTicksWithStderr
+ backticks := osutil.BackTicksWithStderr
cmd := fmt.Sprintf("rm -f '%s/%s.%s'*lck", defaults.VespaHome(), ZOOKEEPER_LOG_FILE_PREFIX, c.ServiceName())
trace.Trace("cleaning locks:", cmd)
out, err := backticks.Run("/bin/sh", "-c", cmd)
if err != nil {
trace.Warning("Failure [", out, "] when running command:", cmd)
- util.ExitErr(err)
+ osutil.ExitErr(err)
}
}