Merge branch 'jdk-11' into master-merge

jdk-11: 5101aa9
master: cbbdba2

cloud/corfu/corfu-cli/templates/pod.yaml

@@ -13,11 +13,7 @@ spec:
     spec:
       containers:
         - name: corfu-cli
-          {{- if .Values.image.registry }}
-          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          {{- else }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          {{- end }}
           command:
             - "sh"
             - "-c"

cloud/corfu/corfu/files/init_layout.py

@@ -21,7 +21,6 @@ def generate_layout(args):
   layout_template["sequencers"] = fqdn_list
   layout_template["segments"][0]["stripes"][0]["logServers"] = fqdn_list
   layout_template["clusterId"] = "456e4567-e89b-12d3-a456-556642440001" if args.type == "source" else "456e4567-e89b-12d3-a456-556642440002"
-
   # print layout
   print("Generated layout:")
   print(json.dumps(layout_template, indent=2))

cloud/corfu/corfu/java_opts/default

@@ -1,20 +1,14 @@
 -verbose:gc \
+-Xloggc:/var/log/corfu/corfu.jvm.gc.9010.log \
 -Xms1g \
 -Xmx3g \
--XX:+PrintGCDetails \
--XX:+PrintGCTimeStamps \
--XX:+PrintGCDateStamps \
--Xloggc:/var/log/corfu/corfu.jvm.gc.9000.log \
+--add-opens=java.base/java.lang=ALL-UNNAMED \
+--add-opens=java.base/java.util=ALL-UNNAMED \
 -XX:+UseG1GC \
 -XX:+UseStringDeduplication \
--XX:+UseGCLogFileRotation \
--XX:NumberOfGCLogFiles=10 \
--XX:GCLogFileSize=5M \
 -XX:+HeapDumpOnOutOfMemoryError \
 -XX:HeapDumpPath=/var/log/corfu/corfu_oom.hprof \
 -XX:+HeapDumpOnOutOfMemoryError \
 -Djdk.nio.maxCachedBufferSize=1048576 \
 -Dio.netty.recycler.maxCapacityPerThread=0 \
--XX:+PrintGCApplicationStoppedTime \
--XX:+PrintGCApplicationConcurrentTime \
--Djava.io.tmpdir=/image/corfu-server/temp
+-Djava.io.tmpdir=/image/corfu-server/temp

cloud/corfu/corfu/java_opts/lr

@@ -1,20 +1,14 @@
 -verbose:gc \
--XX:+PrintGCDetails \
--XX:+PrintGCTimeStamps \
--XX:+PrintGCDateStamps \
 -Xloggc:/var/log/corfu/corfu.jvm.gc.9010.log \
+--add-opens java.base/java.lang=ALL-UNNAMED \
+--add-opens=java.base/java.util=ALL-UNNAMED \
 -XX:+UseG1GC \
 -XX:+UseStringDeduplication \
--XX:+UseGCLogFileRotation \
--XX:NumberOfGCLogFiles=10 \
--XX:GCLogFileSize=5M \
 -XX:+HeapDumpOnOutOfMemoryError \
 -XX:HeapDumpPath=/var/log/corfu-log-replication/corfu-log-replication_oom.hprof \
 -XX:+HeapDumpOnOutOfMemoryError \
 -Djdk.nio.maxCachedBufferSize=1048576 \
 -Dio.netty.recycler.maxCapacityPerThread=0 \
--XX:+PrintGCApplicationStoppedTime \
--XX:+PrintGCApplicationConcurrentTime \
 -Djava.io.tmpdir=/image/corfu-log-replication/temp \
 -Dlog4j.configurationFile=/usr/share/corfu/conf/log-replication-log4j2.xml \
--Dlogback.configurationFile=/usr/share/corfu/conf/corfu-log-replication-logback.prod.xml
+-Dlogback.configurationFile=/usr/share/corfu/conf/corfu-log-replication-logback.prod.xml

cloud/corfu/corfu/templates/_helpers.tpl

@@ -28,6 +28,7 @@ type: {{ .Values.type | default "config" | quote }}
 
 {{- define "corfu.selectors" -}}
 app.kubernetes.io/name: {{ include "corfu.fullname" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{- define "corfu.service.lr" -}}
@@ -54,21 +55,3 @@ it will always override the global value. If not, we will use the global value.
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
-
-{{- define "imageSpec" -}}
-
-    {{- $registry := .image.registry -}}
-    {{- if not $registry -}}{{- $registry = .global.imageRegistry -}}{{- end -}}
-
-    {{- $tag := .image.tag -}}
-    {{- if not $tag -}}{{- $tag = .global.imageTag -}}{{- end -}}
-
-    {{- if and .global .image.digestName -}}
-        {{- if get .global .image.digestName -}}
-            {{- $tag = get .global .image.digestName -}}
-        {{- end -}}
-    {{- end -}}
-
-    {{- $sep := ternary "@" ":" (hasPrefix "sha256:" $tag) -}}
-    {{- printf "%s/%s%s%s" $registry .image.repository $sep $tag -}}
-{{- end -}}

cloud/corfu/corfu/templates/statefulset.yaml

@@ -266,5 +266,13 @@ spec:
         resources:
           requests:
             storage: {{ .Values.persistence.storageSize }}
+    - metadata:
+        name: log-dir
+      spec:
+        accessModes: [ "ReadWriteOnce" ]
+        storageClassName: "{{ .Values.logPersistence.storageClass }}"
+        resources:
+          requests:
+            storage: {{ .Values.logPersistence.storageSize }}
   {{- end }}
 

cloud/corfu/corfu/values.yaml

@@ -15,6 +15,10 @@ persistence:
   enabled: true
   storageSize: 2Gi
   storageClass: "local-path"
+logPersistence:
+  enabled: true
+  storageSize: 4Gi
+  storageClass: "local-path"
 cluster:
   type: "source"
 lr: