Fix UseZGC parameter ordering when used with JDK 11, Fixes #54 (#57)

k8ssandra · Jul 19, 2024 · 6d6f0ac · 6d6f0ac
1 parent 39a6ddd
commit 6d6f0ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/config/builder.go b/pkg/config/builder.go
@@ -360,10 +360,11 @@ func getGCOptions(gcName string, jvmMajor int) []string {
  case "Shenandoah":
  return []string{"-XX:+UseShenandoahGC"}
  case "ZGC":
- zgcOpts := []string{"-XX:+UseZGC"}
+ zgcOpts := make([]string, 0, 1)
  if jvmMajor < 17 {
  zgcOpts = append(zgcOpts, "-XX:+UnlockExperimentalVMOptions")
  }
+ zgcOpts = append(zgcOpts, "-XX:+UseZGC")
  return zgcOpts
  default:
  // User needs to define all the settings

diff --git a/pkg/config/builder_test.go b/pkg/config/builder_test.go
@@ -486,7 +486,7 @@ func TestGCOptions(t *testing.T) {
  assert.Equal([]string{"-XX:+UseShenandoahGC"}, getGCOptions("Shenandoah", 11))
  assert.Equal([]string{"-XX:+UseShenandoahGC"}, getGCOptions("Shenandoah", 17))
 
- assert.Equal([]string{"-XX:+UseZGC", "-XX:+UnlockExperimentalVMOptions"}, getGCOptions("ZGC", 11))
+ assert.Equal([]string{"-XX:+UnlockExperimentalVMOptions", "-XX:+UseZGC"}, getGCOptions("ZGC", 11))
  assert.Equal([]string{"-XX:+UseZGC"}, getGCOptions("ZGC", 17))
 }