Updated Bookkeeper to 4.11.0 (#3571)

apache · Jul 20, 2020 · 8a825e4 · 8a825e4
1 parent c419bc0
commit 8a825e4
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 122 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -45,7 +45,7 @@ reef_version = "0.14.0"
 
 slf4j_version = "1.7.30"
 
-distributedlog_version = "4.7.3"
+distributedlog_version = "4.11.0"
 
 http_client_version = "4.5.2"
 

diff --git a/deploy/kubernetes/general/apiserver.yaml b/deploy/kubernetes/general/apiserver.yaml
@@ -77,7 +77,7 @@ spec:
           tolerationSeconds: 10
       initContainers:
         - name: init-heron-apiserver
-          image: apache/bookkeeper:4.7.3
+          image: apache/bookkeeper:4.11.0
           command: ['sh', '-c', '/opt/bookkeeper/bin/dlog admin bind -l /ledgers -s zookeeper:2181 -c distributedlog://zookeeper:2181/heron']
       containers:
         - name: heron-apiserver

diff --git a/deploy/kubernetes/general/bookkeeper.statefulset.yaml b/deploy/kubernetes/general/bookkeeper.statefulset.yaml
@@ -77,7 +77,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: bookie
-          image: apache/bookkeeper:4.7.3
+          image: apache/bookkeeper:4.11.0
           resources:
             requests:
               memory: "3Gi"
@@ -168,7 +168,7 @@ spec:
     spec:
       containers:
         - name: replication-worker
-          image: apache/bookkeeper:4.7.3
+          image: apache/bookkeeper:4.11.0
           command: [ "/bin/bash", "/opt/bookkeeper/scripts/entrypoint.sh" ]
           args: ["/opt/bookkeeper/bin/bookkeeper", "autorecovery"]
           envFrom:

diff --git a/deploy/kubernetes/general/bookkeeper.statefulset_empty.yaml b/deploy/kubernetes/general/bookkeeper.statefulset_empty.yaml
@@ -77,7 +77,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: bookie
-          image: apache/bookkeeper:4.7.3
+          image: apache/bookkeeper:4.11.0
           resources:
             requests:
               memory: "3Gi"
@@ -151,7 +151,7 @@ spec:
     spec:
       containers:
         - name: replication-worker
-          image: apache/bookkeeper:4.7.3
+          image: apache/bookkeeper:4.11.0
           command: [ "/bin/bash", "/opt/bookkeeper/scripts/entrypoint.sh" ]
           args: ["/opt/bookkeeper/bin/bookkeeper", "autorecovery"]
           envFrom:

diff --git a/deploy/kubernetes/general/bookkeeper.yaml b/deploy/kubernetes/general/bookkeeper.yaml
@@ -66,7 +66,7 @@ spec:
     spec:
       containers:
         - name: bookie
-          image: apache/bookkeeper:4.7.3
+          image: apache/bookkeeper:4.11.0
           resources:
             requests:
               memory: "3Gi"
@@ -152,7 +152,7 @@ spec:
     spec:
       containers:
         - name: replication-worker
-          image: apache/bookkeeper:4.7.3
+          image: apache/bookkeeper:4.11.0
           command: [ "/bin/bash", "/opt/bookkeeper/scripts/entrypoint.sh" ]
           args: ["/opt/bookkeeper/bin/bookkeeper", "autorecovery"]
           envFrom:

diff --git a/deploy/kubernetes/helm/templates/bookie.yaml b/deploy/kubernetes/helm/templates/bookie.yaml
@@ -36,6 +36,7 @@ metadata:
 data:
   BK_BOOKIE_EXTRA_OPTS: "\"-Xms{{ $bookieHeapMemory }} -Xmx{{ $bookieHeapMemory }} -XX:MaxDirectMemorySize={{ $bookieDirectMemory }} -XX:+UseG1GC  -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB\""
   BK_bookiePort: "3181"
+  BK_httpServerPort: "8080"
   BK_journalDirectory: "/bookkeeper/data/journal"
   BK_ledgerDirectories: "/bookkeeper/data/ledgers"
   BK_indexDirectories: "/bookkeeper/data/ledgers" 
@@ -115,7 +116,7 @@ spec:
         # The first time, initialize BK to wipe data for minikube
         - name: bookie-format
           image: {{ .Values.bookkeeper.image }}
-          args: ["/opt/bookkeeper/bin/bookkeeper", "shell", "bookieformat", "--nonInteractive", "-f", "-deleteCookie"]
+          args: ["/opt/bookkeeper/bin/bookkeeper", "shell", "bookieformat", "-nonInteractive", "-force"]
           command: [ "/bin/bash", "/opt/bookkeeper/scripts/entrypoint.sh" ]
           envFrom:
             - configMapRef:

diff --git a/deploy/kubernetes/helm/values.yaml.template b/deploy/kubernetes/helm/values.yaml.template
@@ -67,7 +67,7 @@ bookieStorageCapacity: 15G
 zkReplicas: 3
 
 bookkeeper:
-  image: apache/bookkeeper:4.7.3
+  image: apache/bookkeeper:4.11.0
   imagePullPolicy: IfNotPresent
 
   # set storageClassName to "none" to not use storageClassName

diff --git a/deploy/kubernetes/minikube/apiserver.yaml b/deploy/kubernetes/minikube/apiserver.yaml
@@ -63,7 +63,7 @@ spec:
       serviceAccountName: heron-apiserver
       initContainers:
         - name: init-heron-apiserver
-          image: apache/bookkeeper:4.7.3
+          image: apache/bookkeeper:4.11.0
           command: ['sh', '-c', '/opt/bookkeeper/bin/dlog admin bind -l /ledgers -s zookeeper:2181 -c distributedlog://zookeeper:2181/heronbkdl']
       containers:
         - name: heron-apiserver

diff --git a/deploy/kubernetes/minikube/bookkeeper.yaml b/deploy/kubernetes/minikube/bookkeeper.yaml
@@ -26,6 +26,8 @@ metadata:
 data:
   BK_BOOKIE_EXTRA_OPTS: "\"-Xms1g -Xmx1g -XX:MaxDirectMemorySize=1g -XX:+UseG1GC  -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB\""
   BK_bookiePort: "3181"
+  BK_httpServerPort: "8080"
+  BK_useHostNameAsBookieID: "true"
   BK_journalDirectory: "/bookkeeper/data/journal"
   BK_ledgerDirectories: "/bookkeeper/data/ledgers"
   BK_indexDirectories: "/bookkeeper/data/ledgers" 
@@ -59,8 +61,8 @@ spec:
       initContainers:
         # The first time, initialize BK to wipe data for minikube
         - name: bookie-format
-          image: apache/bookkeeper:4.7.3
-          args: ["/opt/bookkeeper/bin/bookkeeper", "shell", "bookieformat", "--nonInteractive", "-f", "-deleteCookie"]
+          image: apache/bookkeeper:4.11.0
+          args: ["/opt/bookkeeper/bin/bookkeeper", "shell", "bookieformat", "-nonInteractive", "-force"]
           command: [ "/bin/bash", "/opt/bookkeeper/scripts/entrypoint.sh" ]
           envFrom:
             - configMapRef:
@@ -72,7 +74,7 @@ spec:
               mountPath: /bookkeeper/data/ledgers
       containers:
         - name: bookie
-          image: apache/bookkeeper:4.7.3
+          image: apache/bookkeeper:4.11.0
           resources:
             requests:
               memory: "1Gi"