Fix Pravega and BookKeeper Java options

.travis.yml

@@ -29,7 +29,7 @@ jobs:
 
     - stage: e2e
       name: End-to-end tests
-      if: type = pull_request OR branch = master
+      if: type = pull_request OR branch = master OR tag IS present
       services:
         - docker
       env:
@@ -85,7 +85,7 @@ jobs:
 
     - stage: deploy
       name: Push Docker image
-      if: branch = master AND tag IS present
+      if: type != pull_request AND tag IS present
       services:
         - docker
       script:

pkg/controller/pravega/bookie.go

@@ -184,12 +184,18 @@ func makeBookieVolumeClaimTemplates(spec *v1alpha1.BookkeeperSpec) []corev1.Pers
 }
 
 func MakeBookieConfigMap(pravegaCluster *v1alpha1.PravegaCluster) *corev1.ConfigMap {
-	javaOpts := []string{
+	memoryOpts := []string{
 		"-Xms1g",
 		"-XX:+UnlockExperimentalVMOptions",
 		"-XX:+UseCGroupMemoryLimitForHeap",
-		"-XX:MaxRAMFraction=1",
+		"-XX:MaxRAMFraction=2",
 		"-XX:MaxDirectMemorySize=1g",
+		"-XX:+ExitOnOutOfMemoryError",
+		"-XX:+CrashOnOutOfMemoryError",
+		"-XX:+HeapDumpOnOutOfMemoryError",
+	}
+
+	gcOpts := []string{
 		"-XX:+UseG1GC",
 		"-XX:MaxGCPauseMillis=10",
 		"-XX:+ParallelRefProcEnabled",
@@ -202,9 +208,20 @@ func MakeBookieConfigMap(pravegaCluster *v1alpha1.PravegaCluster) *corev1.Config
 		"-XX:-ResizePLAB",
 	}
 
+	gcLoggingOpts := []string{
+		"-XX:+PrintGCDetails",
+		"-XX:+PrintGCDateStamps",
+		"-XX:+PrintGCApplicationStoppedTime",
+		"-XX:+UseGCLogFileRotation",
+		"-XX:NumberOfGCLogFiles=5",
+		"-XX:GCLogFileSize=64m",
+	}
+
 	configData := map[string]string{
-		"BK_BOOKIE_EXTRA_OPTS": strings.Join(javaOpts, " "),
-		"ZK_URL":               pravegaCluster.Spec.ZookeeperUri,
+		"BOOKIE_MEM_OPTS":        strings.Join(memoryOpts, " "),
+		"BOOKIE_GC_OPTS":         strings.Join(gcOpts, " "),
+		"BOOKIE_GC_LOGGING_OPTS": strings.Join(gcLoggingOpts, " "),
+		"ZK_URL":                 pravegaCluster.Spec.ZookeeperUri,
 		// Set useHostNameAsBookieID to false until BookKeeper Docker
 		// image is updated to 4.7
 		// This value can be explicitly overridden when using the operator

pkg/controller/pravega/pravega_controller.go

@@ -117,9 +117,13 @@ func makeControllerPodSpec(name string, pravegaSpec *api.PravegaSpec) *corev1.Po
 
 func MakeControllerConfigMap(p *api.PravegaCluster) *corev1.ConfigMap {
 	var javaOpts = []string{
-		"-Xms1g",
+		"-Xms512m",
 		"-XX:+UnlockExperimentalVMOptions",
 		"-XX:+UseCGroupMemoryLimitForHeap",
+		"-XX:MaxRAMFraction=2",
+		"-XX:+ExitOnOutOfMemoryError",
+		"-XX:+CrashOnOutOfMemoryError",
+		"-XX:+HeapDumpOnOutOfMemoryError",
 		"-Dpravegaservice.clusterName=" + p.Name,
 	}
 

pkg/controller/pravega/pravega_segmentstore.go

@@ -146,7 +146,10 @@ func MakeSegmentstoreConfigMap(p *api.PravegaCluster) *corev1.ConfigMap {
 		"-Xms1g",
 		"-XX:+UnlockExperimentalVMOptions",
 		"-XX:+UseCGroupMemoryLimitForHeap",
-		"-XX:MaxRAMFraction=1",
+		"-XX:MaxRAMFraction=2",
+		"-XX:+ExitOnOutOfMemoryError",
+		"-XX:+CrashOnOutOfMemoryError",
+		"-XX:+HeapDumpOnOutOfMemoryError",
 		"-Dpravegaservice.clusterName=" + p.Name,
 	}