Enable containerV2 by default

wip: Make containerV2 default to true

wip: Make containerV2 default to true

wip: re-add containerv2 flag to test configs.

add debug logs

remove more containerV2 flags

try omitempty

use setToDefaults

outparamcheck

use field.Addr().Interface()

pass addr of conf

don't take addr of unaddressable value

use *bool

set default

update config_test

set containerv2: false for existing configs

nil check

update test expectation

Remove debug logs. Add nl

README.md

@@ -162,6 +162,7 @@ variable):
 This will cause the JVM 11+ to discover the ``MaxRAM`` value using Linux cgroups, and calculate the heap sizes as the specified
 percentage of ``MaxRAM`` value, e.g. ``max-heap-size = MaxRAM * MaxRamPercentage``.
 
+TODO(pmarupaka): Update this.
 If the experimental flag `containerV2` is set:
 1. The `-XX:ActiveProcessorCount` is unset, it will remain unset.
 1. Args with prefix``-Xmx|-Xms`` in both static and custom jvm opts will be filtered out. If neither 

integration_test/go_java_launcher_integration_test.go

@@ -144,7 +144,7 @@ func TestMainMethodWithoutCustomConfig(t *testing.T) {
 }
 
 func TestMainMethodContainerWithoutCustomConfig(t *testing.T) {
-	output := testContainerSupportEnabled(t, "foo", "-XX\\:InitialRAMPercentage=75.0 -XX\\:MaxRAMPercentage=75.0 -XX\\:ActiveProcessorCount=2", []string{})
+	output := testContainerSupportEnabled(t, "foo", "", []string{"-Xmx", "-Xms"})
 	assert.Regexp(t, `Failed to read custom config file, assuming no custom config: foo`, output)
 }
 

integration_test/testdata/launcher-custom-dangerous-disable-container-support.yml

@@ -3,3 +3,5 @@ configVersion: 1
 jvmOpts:
   - '-Xmx1g'
 dangerousDisableContainerSupport: true
+experimental:
+  containerV2: false

integration_test/testdata/launcher-custom-experimental-container-v2-with-max-ram-percentage.yml

@@ -2,4 +2,3 @@ configType: java
 configVersion: 1
 jvmOpts:
   - '-XX:MaxRAMPercentage=70.0'
-

integration_test/testdata/launcher-custom-initial-and-max-ram-percentage-override.yml

@@ -4,3 +4,5 @@ jvmOpts:
   - '-Xmx1g'
   - '-XX:InitialRAMPercentage=79.9'
   - '-XX:MaxRAMPercentage=80.9'
+experimental:
+  containerV2: false

integration_test/testdata/launcher-custom-initial-ram-percentage-override.yml

@@ -3,3 +3,5 @@ configVersion: 1
 jvmOpts:
   - '-Xmx1g'
   - '-XX:InitialRAMPercentage=79.9'
+experimental:
+  containerV2: false

integration_test/testdata/launcher-custom-max-ram-override.yml

@@ -2,3 +2,5 @@ configType: java
 configVersion: 1
 jvmOpts:
   - '-XX:MaxRAM=1001'
+experimental:
+  containerV2: false

integration_test/testdata/launcher-custom-max-ram-percentage-override.yml

@@ -3,3 +3,5 @@ configVersion: 1
 jvmOpts:
   - '-Xmx1g'
   - '-XX:MaxRAMPercentage=79.9'
+experimental:
+  containerV2: false

integration_test/testdata/launcher-custom-multiprocess-long-sub-process.yml

@@ -9,3 +9,5 @@ subProcesses:
       SLEEP_TIME: "200"
     jvmOpts:
       - '-Xmx1g'
+experimental:
+  containerV2: false

integration_test/testdata/launcher-custom-multiprocess.yml

@@ -7,3 +7,5 @@ subProcesses:
     configType: java
     jvmOpts:
       - '-Xmx1g'
+experimental:
+  containerV2: false

integration_test/testdata/launcher-custom.yml

@@ -2,3 +2,5 @@ configType: java
 configVersion: 1
 jvmOpts:
   - '-Xmx1g'
+experimental:
+  containerV2: false

integration_test/testdata/launcher-static-bad-java-home.yml

@@ -9,3 +9,5 @@ jvmOpts:
 args:
   - arg1
 javaHome: /foo/bar
+experimental:
+  containerV2: false

integration_test/testdata/launcher-static-multiprocess.yml

@@ -16,3 +16,5 @@ subProcesses:
       - ./testdata/
     jvmOpts:
       - '-Xmx4M'
+experimental:
+  containerV2: false

integration_test/testdata/launcher-static-with-dirs.yml

@@ -11,3 +11,5 @@ args:
 dirs:
   - foo
   - bar/baz
+experimental:
+  containerV2: false

integration_test/testdata/launcher-static.yml

@@ -8,3 +8,5 @@ jvmOpts:
   - '-Xmx4M'
 args:
   - arg1
+experimental:
+  containerV2: false

launchlib/config.go

@@ -72,7 +72,7 @@ type CustomLauncherConfig struct {
 }
 
 type ExperimentalLauncherConfig struct {
-	ContainerV2 bool `yaml:"containerV2"`
+	ContainerV2 *bool `yaml:"containerV2"`
 }
 
 type PrimaryCustomLauncherConfig struct {
@@ -267,6 +267,10 @@ func parseCustomConfig(yamlString []byte) (PrimaryCustomLauncherConfig, error) {
 				"subProcess config %s", name)
 		}
 	}
+	if config.Experimental.ContainerV2 == nil {
+		var trueVal = true
+		config.Experimental.ContainerV2 = &trueVal
+	}
 	return config, nil
 }
 

launchlib/config_test.go

@@ -20,6 +20,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+var trueValue = true
+
 func TestParseStaticConfig(t *testing.T) {
 	for i, currCase := range []struct {
 		name string
@@ -188,6 +190,7 @@ jvmOpts:
 					},
 					JvmOpts:                 []string{"jvmOpt1", "jvmOpt2"},
 					DisableContainerSupport: false,
+					Experimental:            ExperimentalLauncherConfig{ContainerV2: &trueValue},
 				},
 			},
 		},
@@ -208,7 +211,8 @@ jvmOpts:
 					TypedConfig: TypedConfig{
 						Type: "java",
 					},
-					JvmOpts: []string{"jvmOpt1", "jvmOpt2"},
+					JvmOpts:      []string{"jvmOpt1", "jvmOpt2"},
+					Experimental: ExperimentalLauncherConfig{ContainerV2: &trueValue},
 				},
 			},
 		},
@@ -234,7 +238,8 @@ jvmOpts:
 					Env: map[string]string{
 						"SOME_ENV_VAR": "{{CWD}}/etc/profile",
 					},
-					JvmOpts: []string{"jvmOpt1", "jvmOpt2"},
+					JvmOpts:      []string{"jvmOpt1", "jvmOpt2"},
+					Experimental: ExperimentalLauncherConfig{ContainerV2: &trueValue},
 				},
 			},
 		},
@@ -272,7 +277,8 @@ subProcesses:
 					Env: map[string]string{
 						"SOME_ENV_VAR": "{{CWD}}/etc/profile",
 					},
-					JvmOpts: []string{"jvmOpt1", "jvmOpt2"},
+					JvmOpts:      []string{"jvmOpt1", "jvmOpt2"},
+					Experimental: ExperimentalLauncherConfig{ContainerV2: &trueValue},
 				},
 				SubProcesses: map[string]CustomLauncherConfig{
 					"envoy": {
@@ -306,6 +312,7 @@ dangerousDisableContainerSupport: true
 					},
 					JvmOpts:                 []string{"jvmOpt1", "jvmOpt2"},
 					DisableContainerSupport: true,
+					Experimental:            ExperimentalLauncherConfig{ContainerV2: &trueValue},
 				},
 			},
 		},
@@ -330,6 +337,7 @@ env:
 						"SOME_ENV_VAR":  "/etc/profile",
 						"OTHER_ENV_VAR": "/etc/redhat-release",
 					},
+					Experimental: ExperimentalLauncherConfig{ContainerV2: &trueValue},
 				},
 			},
 		},

launchlib/launcher.go

@@ -281,7 +281,9 @@ func delim(str string) string {
 func createJvmOpts(combinedJvmOpts []string, customConfig *CustomLauncherConfig, logger io.WriteCloser) []string {
 	if isEnvVarSet("CONTAINER") && !customConfig.DisableContainerSupport && !hasMaxRAMOverride(combinedJvmOpts) {
 		_, _ = fmt.Fprintln(logger, "Container support enabled")
-		if !customConfig.Experimental.ContainerV2 {
+		// If the containerV2 field is nil, there was a failure reading the custom config file, and we use the default
+		// behavior of enabling containerV2 behavior.
+		if customConfig.Experimental.ContainerV2 != nil && !*customConfig.Experimental.ContainerV2 {
 			combinedJvmOpts = filterHeapSizeArgs(combinedJvmOpts)
 			combinedJvmOpts = ensureActiveProcessorCount(combinedJvmOpts, logger)
 		} else {