Issue 226: Pass jvm options

pkg/apis/pravega/v1alpha1/bookkeeper.go

@@ -82,6 +82,11 @@ type BookkeeperSpec struct {
 	// in bookkeeper. Some examples can be found here
 	// https://github.com/apache/bookkeeper/blob/master/docker/README.md
 	Options map[string]string `json:"options"`
+
+	// JVM is the JVM options for bookkeeper. It will be passed to the JVM for performance tuning.
+	// If this field is not specified, the operator will use a set of default
+	// options that is good enough for general deployment.
+	JVM *BookkeeperJVMOptions `json:"jvm"`
 }
 
 func (s *BookkeeperSpec) withDefaults() (changed bool) {
@@ -130,6 +135,10 @@ func (s *BookkeeperSpec) withDefaults() (changed bool) {
 		s.Options = map[string]string{}
 	}
 
+	if s.JVM == nil {
+		s.JVM = &BookkeeperJVMOptions{}
+	}
+
 	return changed
 }
 
@@ -138,6 +147,12 @@ type BookkeeperImageSpec struct {
 	ImageSpec
 }
 
+type BookkeeperJVMOptions struct {
+	MemoryOpts    []string `json:"memoryOpts"`
+	GcOpts        []string `json:"gcOpts"`
+	GcLoggingOpts []string `json:"gcLoggingOpts"`
+}
+
 func (s *BookkeeperImageSpec) withDefaults() (changed bool) {
 	if s.Repository == "" {
 		changed = true

pkg/apis/pravega/v1alpha1/pravega.go

@@ -88,6 +88,11 @@ type PravegaSpec struct {
 	// https://github.com/pravega/pravega/blob/master/config/config.properties
 	Options map[string]string `json:"options"`
 
+	// JVM is the JVM options for controller and segmentstore. It will be passed to the JVM
+	// for performance tuning. If this field is not specified, the operator will use a set of default
+	// options that is good enough for general deployment.
+	JVM *PravegaJVMOptions `json:"jvm"`
+
 	// CacheVolumeClaimTemplate is the spec to describe PVC for the Pravega cache.
 	// This field is optional. If no PVC spec, stateful containers will use
 	// emptyDir as volume
@@ -139,6 +144,13 @@ func (s *PravegaSpec) withDefaults() (changed bool) {
 		s.Options = map[string]string{}
 	}
 
+	if s.JVM == nil {
+		changed = true
+		s.JVM = &PravegaJVMOptions{}
+		s.JVM.Controller = []string{}
+		s.JVM.Segmentstore = []string{}
+	}
+
 	if s.CacheVolumeClaimTemplate == nil {
 		changed = true
 		s.CacheVolumeClaimTemplate = &v1.PersistentVolumeClaimSpec{
@@ -262,3 +274,8 @@ type HDFSSpec struct {
 	Root              string `json:"root"`
 	ReplicationFactor int32  `json:"replicationFactor"`
 }
+
+type PravegaJVMOptions struct {
+	Controller   []string `json:"controller"`
+	Segmentstore []string `json:"segmentstore"`
+}

pkg/controller/pravega/bookie.go

@@ -204,6 +204,7 @@ func MakeBookieConfigMap(pravegaCluster *v1alpha1.PravegaCluster) *corev1.Config
 			"-XX:MaxRAMFraction=2",
 		)
 	}
+	memoryOpts = util.OverrideDefaultJVMOptions(memoryOpts, pravegaCluster.Spec.Bookkeeper.JVM.MemoryOpts)
 
 	gcOpts := []string{
 		"-XX:+UseG1GC",
@@ -217,6 +218,7 @@ func MakeBookieConfigMap(pravegaCluster *v1alpha1.PravegaCluster) *corev1.Config
 		"-XX:+DisableExplicitGC",
 		"-XX:-ResizePLAB",
 	}
+	gcOpts = util.OverrideDefaultJVMOptions(gcOpts, pravegaCluster.Spec.Bookkeeper.JVM.GcOpts)
 
 	gcLoggingOpts := []string{
 		"-XX:+PrintGCDetails",
@@ -226,6 +228,7 @@ func MakeBookieConfigMap(pravegaCluster *v1alpha1.PravegaCluster) *corev1.Config
 		"-XX:NumberOfGCLogFiles=5",
 		"-XX:GCLogFileSize=64m",
 	}
+	gcLoggingOpts = util.OverrideDefaultJVMOptions(gcLoggingOpts, pravegaCluster.Spec.Bookkeeper.JVM.GcLoggingOpts)
 
 	configData := map[string]string{
 		"BOOKIE_MEM_OPTS":          strings.Join(memoryOpts, " "),

pkg/controller/pravega/pravega_controller.go

@@ -143,23 +143,28 @@ func configureControllerTLSSecrets(podSpec *corev1.PodSpec, p *api.PravegaCluste
 }
 
 func MakeControllerConfigMap(p *api.PravegaCluster) *corev1.ConfigMap {
-	var javaOpts = []string{
+	javaOpts := []string{
+		"-Dpravegaservice.clusterName=" + p.Name,
+	}
+
+	jvmOpts := []string{
 		"-Xms512m",
 		"-XX:+ExitOnOutOfMemoryError",
 		"-XX:+CrashOnOutOfMemoryError",
 		"-XX:+HeapDumpOnOutOfMemoryError",
-		"-Dpravegaservice.clusterName=" + p.Name,
 	}
 
 	if match, _ := util.CompareVersions(p.Spec.Version, "0.4.0", ">="); match {
 		// Pravega < 0.4 uses a Java version that does not support the options below
-		javaOpts = append(javaOpts,
+		jvmOpts = append(jvmOpts,
 			"-XX:+UnlockExperimentalVMOptions",
 			"-XX:+UseCGroupMemoryLimitForHeap",
 			"-XX:MaxRAMFraction=2",
 		)
 	}
 
+	javaOpts = append(javaOpts, util.OverrideDefaultJVMOptions(jvmOpts, p.Spec.Pravega.JVM.Controller)...)
+
 	for name, value := range p.Spec.Pravega.Options {
 		javaOpts = append(javaOpts, fmt.Sprintf("-D%v=%v", name, value))
 	}

pkg/controller/pravega/pravega_segmentstore.go

@@ -148,26 +148,30 @@ func makeSegmentstorePodSpec(p *api.PravegaCluster) corev1.PodSpec {
 
 func MakeSegmentstoreConfigMap(p *api.PravegaCluster) *corev1.ConfigMap {
 	javaOpts := []string{
+		"-Dpravegaservice.clusterName=" + p.Name,
+	}
+
+	jvmOpts := []string{
 		"-Xms1g",
 		"-XX:+ExitOnOutOfMemoryError",
 		"-XX:+CrashOnOutOfMemoryError",
 		"-XX:+HeapDumpOnOutOfMemoryError",
-		"-Dpravegaservice.clusterName=" + p.Name,
 	}
 
 	if match, _ := util.CompareVersions(p.Spec.Version, "0.4.0", ">="); match {
 		// Pravega < 0.4 uses a Java version that does not support the options below
-		javaOpts = append(javaOpts,
+		jvmOpts = append(jvmOpts,
 			"-XX:+UnlockExperimentalVMOptions",
 			"-XX:+UseCGroupMemoryLimitForHeap",
 			"-XX:MaxRAMFraction=2",
 		)
 	}
 
+	javaOpts = append(javaOpts, util.OverrideDefaultJVMOptions(jvmOpts, p.Spec.Pravega.JVM.Segmentstore)...)
+
 	for name, value := range p.Spec.Pravega.Options {
 		javaOpts = append(javaOpts, fmt.Sprintf("-D%v=%v", name, value))
 	}
-
 	configData := map[string]string{
 		"AUTHORIZATION_ENABLED": "false",
 		"CLUSTER_NAME":          p.Name,