diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-07 17:59:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-07 17:59:23 +0200 |
| commit | ce5a6030cca10e3c4f0293f6700dd59f07593462 (patch) | |
| tree | 6be6c100e527a432bec25d63640cc882c4cd9dbb | |
| parent | 8a8ebfdedfab362ac5446a8901100bdd85e909b5 (diff) | |
| parent | 8bb498f250ae221137fd7488d60c58d06d3fca95 (diff) | |
Merge pull request #27978 from vespa-engine/arnej/skip-missing-preload-files
check files from PRELOAD variable
| -rw-r--r-- | client/go/internal/admin/jvm/env.go | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/client/go/internal/admin/jvm/env.go b/client/go/internal/admin/jvm/env.go index 7b1ce97a40a..1cbdb46648f 100644 --- a/client/go/internal/admin/jvm/env.go +++ b/client/go/internal/admin/jvm/env.go @@ -5,10 +5,12 @@ package jvm import ( "fmt" + "strings" "github.com/vespa-engine/vespa/client/go/internal/admin/defaults" "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" ) @@ -29,8 +31,19 @@ func (opts *Options) exportEnvSettings(ps *prog.Spec) { ps.Setenv(envvars.LD_LIBRARY_PATH, dlp) ps.Setenv(envvars.MALLOC_ARENA_MAX, "1") if preload := ps.Getenv(envvars.PRELOAD); preload != "" { - ps.Setenv(envvars.JAVAVM_LD_PRELOAD, preload) - ps.Setenv(envvars.LD_PRELOAD, preload) + checked := []string{} + for _, fileName := range strings.Split(preload, ":") { + if util.PathExists(fileName) { + checked = append(checked, fileName) + } else { + trace.Info("File in PRELOAD missing, skipped:", fileName) + } + } + if len(checked) > 0 { + preload := strings.Join(checked, ":") + ps.Setenv(envvars.JAVAVM_LD_PRELOAD, preload) + ps.Setenv(envvars.LD_PRELOAD, preload) + } } util.OptionallyReduceTimerFrequency() c.exportExtraEnv(ps) |