Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[supervisor] remove JAVA_TOOL_OPTIONS hack #19630

Merged
merged 1 commit into from
May 3, 2024
Merged

[supervisor] remove JAVA_TOOL_OPTIONS hack #19630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions components/common-go/experiments/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const (
SupervisorUsePublicAPIFlag = "supervisor_experimental_publicapi"
ServiceWaiterSkipComponentsFlag = "service_waiter_skip_components"
IdPClaimKeysFlag = "idp_claim_keys"
SetJavaXmxFlag = "supervisor_set_java_xmx"
)

func IsPersonalAccessTokensEnabled(ctx context.Context, client Client, attributes Attributes) bool {
Expand All @@ -41,3 +42,7 @@ func SupervisorPersistServerAPIChannelWhenStart(ctx context.Context, client Clie
func SupervisorUsePublicAPI(ctx context.Context, client Client, attributes Attributes) bool {
return client.GetBoolValue(ctx, SupervisorUsePublicAPIFlag, false, attributes)
}

func IsSetJavaXmx(ctx context.Context, client Client, attributes Attributes) bool {
return client.GetBoolValue(ctx, SetJavaXmxFlag, false, attributes)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@svenefftinge default should be true, for backward compatibility? not sure

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to go the other way around and see how it's going. Ideally we can get rid of this special hack and users do this themselves.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, it is just if there is a connection hiccups or so it maybe impossible to revert this change via the feature flag

}
31 changes: 17 additions & 14 deletions components/supervisor/pkg/supervisor/supervisor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,23 @@ func Run(options ...RunOption) {
return
}

endpoint, host, err := cfg.GitpodAPIEndpoint()
if err != nil {
log.WithError(err).Fatal("cannot find Gitpod API endpoint")
}

experimentsClientOpts := []experiments.ClientOpt{}
if cfg.ConfigcatEnabled {
experimentsClientOpts = append(experimentsClientOpts, experiments.WithGitpodProxy(host))
}
exps := experiments.NewClient(experimentsClientOpts...)
Copy link
Member

@akosyakov akosyakov May 3, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there should be already exps defined in this file

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/gitpod-io/gitpod/blob/1aa8db11790817494268b6901c84b3636744503b/components/supervisor/pkg/supervisor/supervisor.go#L258C2-L258C6

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I moved that up


// BEWARE: we can only call buildChildProcEnv once, because it might download env vars from a one-time-secret
// URL, which would fail if we tried another time.
childProcEnvvars = buildChildProcEnv(cfg, nil, opts.RunGP)
isSetJavaXmx := experiments.IsSetJavaXmx(context.Background(), exps, experiments.Attributes{
UserID: cfg.OwnerId,
})
childProcEnvvars = buildChildProcEnv(cfg, nil, opts.RunGP, isSetJavaXmx)

err = AddGitpodUserIfNotExists()
if err != nil {
Expand Down Expand Up @@ -246,17 +260,6 @@ func Run(options ...RunOption) {
internalPorts = append(internalPorts, debugProxyPort)
}

endpoint, host, err := cfg.GitpodAPIEndpoint()
if err != nil {
log.WithError(err).Fatal("cannot find Gitpod API endpoint")
}

experimentsClientOpts := []experiments.ClientOpt{}
if cfg.ConfigcatEnabled {
experimentsClientOpts = append(experimentsClientOpts, experiments.WithGitpodProxy(host))
}
exps := experiments.NewClient(experimentsClientOpts...)

var (
ideReady = &ideReadyState{cond: sync.NewCond(&sync.Mutex{})}
desktopIdeReady *ideReadyState = nil
Expand Down Expand Up @@ -952,7 +955,7 @@ func prepareIDELaunch(cfg *Config, ideConfig *IDEConfig) *exec.Cmd {
// of envvars. If envvars is nil, os.Environ() is used.
//
// Beware: if config contains an OTS URL the results may differ on subsequent calls.
func buildChildProcEnv(cfg *Config, envvars []string, runGP bool) []string {
func buildChildProcEnv(cfg *Config, envvars []string, runGP bool, setJavaXmx bool) []string {
if envvars == nil {
envvars = os.Environ()
}
Expand Down Expand Up @@ -1029,7 +1032,7 @@ func buildChildProcEnv(cfg *Config, envvars []string, runGP bool) []string {
envs["USER"] = "gitpod"

// Particular Java optimisation: Java pre v10 did not gauge it's available memory correctly, and needed explicitly setting "-Xmx" for all Hotspot/openJDK VMs
if mem, ok := envs["GITPOD_MEMORY"]; ok {
if mem, ok := envs["GITPOD_MEMORY"]; ok && setJavaXmx {
envs["JAVA_TOOL_OPTIONS"] += fmt.Sprintf(" -Xmx%sm", mem)
}

Expand Down
2 changes: 1 addition & 1 deletion components/supervisor/pkg/supervisor/supervisor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func TestBuildChildProcEnv(t *testing.T) {
cfg.EnvvarOTS = srv.URL
}

act := buildChildProcEnv(cfg, test.Input, false)
act := buildChildProcEnv(cfg, test.Input, false, false)
assert(t, act)
})
}
Expand Down