Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Commit 278c05a

Browse files
huijunwuhuijunwnicknezis
authored
zookeeper to 3.5.8 (#3555)
* Upgrade zookeeper3.5.8 Co-authored-by: Huijun Wu <[email protected]> Co-authored-by: Nicholas Nezis <[email protected]>
1 parent 4f7f90f commit 278c05a

29 files changed

+3040
-2700
lines changed

‎WORKSPACE

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ maven_install(
6666
name = "maven",
6767
artifacts = [
6868
"antlr:antlr:2.7.7",
69-
"org.apache.zookeeper:zookeeper:3.4.14",
69+
"org.apache.zookeeper:zookeeper:3.5.8",
7070
"io.kubernetes:client-java:" + kubernetes_client_version,
7171
"com.esotericsoftware:kryo:3.0.3",
7272
"org.apache.avro:avro:1.7.4",
@@ -282,11 +282,8 @@ http_archive(
282282
http_archive(
283283
name = "org_apache_zookeeper",
284284
build_file = "@//:third_party/zookeeper/BUILD",
285-
patch_args = ["-p2"],
286-
patches = ["//third_party/zookeeper:pkgconfig.patch"],
287-
sha256 = "b14f7a0fece8bd34c7fffa46039e563ac5367607c612517aa7bd37306afbd1cd",
288-
strip_prefix = "zookeeper-3.4.14",
289-
urls = ["https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz"],
285+
strip_prefix = "apache-zookeeper-3.5.8",
286+
urls = ["https://archive.apache.org/dist/zookeeper/zookeeper-3.5.8/apache-zookeeper-3.5.8.tar.gz"],
290287
)
291288

292289
http_archive(

‎bazel_configure.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ def main():
422422

423423
env_map['AR'] = discover_tool('ar', 'archiver', 'AR')
424424
env_map['GCOV']= discover_tool('gcov','coverage tool', 'GCOV')
425+
env_map['ANT'] = discover_tool('ant', "ant", 'ANT')
425426
env_map['DWP'] = discover_tool_default('dwp', 'dwp', 'DWP', '/usr/bin/dwp')
426427
env_map['NM'] = discover_tool_default('nm', 'nm', 'NM', '/usr/bin/nm')
427428
env_map['OBJCOPY'] = discover_tool_default('objcopy', 'objcopy', 'OBJCOPY', '/usr/bin/objcopy')

‎deploy/kubernetes/helm/templates/bookie.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,21 @@ spec:
111111
{{- end }}
112112
terminationGracePeriodSeconds: 0
113113
initContainers:
114+
{{- if eq .Values.platform "minikube" }}
115+
# The first time, initialize BK to wipe data for minikube
116+
- name: bookie-format
117+
image: {{ .Values.bookkeeper.image }}
118+
args: ["/opt/bookkeeper/bin/bookkeeper", "shell", "bookieformat", "--nonInteractive", "-f", "-deleteCookie"]
119+
command: [ "/bin/bash", "/opt/bookkeeper/scripts/entrypoint.sh" ]
120+
envFrom:
121+
- configMapRef:
122+
name: {{ .Release.Name }}-bookie-config
123+
volumeMounts:
124+
- name: journal-disk
125+
mountPath: /bookkeeper/data/journal
126+
- name: ledgers-disk
127+
mountPath: /bookkeeper/data/ledgers
128+
{{- end }}
114129
# Wait until the zookeeper pods are up and running
115130
- name: bookie-init-container
116131
image: {{ .Values.image }} # use heron image until bookkeeper has nc

‎docker/base/Dockerfile.base.debian9

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
FROM openjdk:11-jdk-slim-stretch
1919

2020
RUN apt-get -y update && apt-get -y install \
21+
ant \
2122
netcat-openbsd \
2223
python3 \
2324
unzip \
@@ -27,7 +28,7 @@ RUN apt-get -y update && apt-get -y install \
2728
rm -rf /var/lib/apt/lists/*
2829

2930
# install zookeeper
30-
ARG ZK_DIST=zookeeper-3.4.14
31+
ARG ZK_DIST=zookeeper-3.5.8
3132
ADD base/scripts /opt/heron-docker/scripts
3233

3334
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST

‎docker/base/conf/zookeeper.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ autopurge.snapRetainCount=3
2424
# Purge task interval in hours
2525
# Set to "0" to disable auto purge feature
2626
autopurge.purgeInterval=1
27+
# Enable all four letter word commands by default
28+
4lw.commands.whitelist=*

‎docker/base/scripts/install-zookeeper.sh

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,23 @@
1919
if [ "$#" -ne 1 ]; then
2020
echo "Usage: $0 zookeeper-<version-number>"
2121
echo "Example:"
22-
echo "$ $0 zookeeper-3.4.14"
22+
echo "$ $0 zookeeper-3.5.8"
2323
exit 1
2424
fi
2525

2626
ZK_DIST=$1
2727

28-
curl -O "https://archive.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz"
29-
tar -xzf ./$ZK_DIST.tar.gz -C /opt
30-
rm ./$ZK_DIST.tar.gz
28+
curl -O "https://archive.apache.org/dist/zookeeper/$ZK_DIST/apache-$ZK_DIST-bin.tar.gz"
29+
tar -xzf ./apache-$ZK_DIST-bin.tar.gz -C /opt
30+
rm ./apache-$ZK_DIST-bin.tar.gz
31+
32+
mv /opt/apache-$ZK_DIST-bin /opt/zookeeper
33+
rm -rf \
34+
/opt/zookeeper/README.txt \
35+
/opt/zookeeper/NOTICE.txt \
36+
/opt/zookeeper/README_packaging.txt \
37+
/opt/zookeeper/docs \
3138

32-
mv /opt/$ZK_DIST /opt/zookeeper
33-
rm -rf /opt/zookeeper/CHANGES.txt \
34-
/opt/zookeeper/README.txt \
35-
/opt/zookeeper/NOTICE.txt \
36-
/opt/zookeeper/CHANGES.txt \
37-
/opt/zookeeper/README_packaging.txt \
38-
/opt/zookeeper/build.xml \
39-
/opt/zookeeper/config \
40-
/opt/zookeeper/contrib \
41-
/opt/zookeeper/dist-maven \
42-
/opt/zookeeper/docs \
43-
/opt/zookeeper/ivy.xml \
44-
/opt/zookeeper/ivysettings.xml \
45-
/opt/zookeeper/recipes \
46-
/opt/zookeeper/src \
47-
/opt/zookeeper/$ZK_DIST.jar.asc \
48-
/opt/zookeeper/$ZK_DIST.jar.md5 \
49-
/opt/zookeeper/$ZK_DIST.jar.sha1
5039

5140
# copy zk scripts
5241
mkdir -p /opt/zookeeper/scripts
@@ -55,6 +44,6 @@ chmod +x /opt/heron-docker/scripts/generate-zookeeper-config.sh
5544
cp /opt/heron-docker/scripts/zookeeper-ruok.sh /opt/zookeeper/scripts/
5645
chmod +x /opt/heron-docker/scripts/zookeeper-ruok.sh
5746
cp /opt/heron-docker/scripts/start-zookeeper.sh /opt/zookeeper/scripts/
58-
chmod +x /opt/heron-docker/scripts/
47+
chmod +x /opt/heron-docker/scripts/start-zookeeper.sh
5948
cp /opt/heron-docker/scripts/wait-for-zookeeper.sh /opt/zookeeper/scripts/
6049
chmod +x /opt/heron-docker/scripts/wait-for-zookeeper.sh

‎docker/compile/Dockerfile.centos7

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ ENV bazelVersion 3.0.0
2323

2424
RUN yum -y upgrade
2525
RUN yum -y install \
26+
ant \
2627
automake \
2728
curl \
29+
cppunit-devel \
2830
cmake \
2931
openssl-devel \
3032
file \

‎docker/compile/Dockerfile.debian10

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ENV TARGET_PLATFORM debian
2222
ENV bazelVersion 3.0.0
2323

2424
RUN apt-get update && apt-get -y install \
25+
ant \
2526
automake \
2627
build-essential \
2728
cmake \

‎docker/compile/Dockerfile.debian9

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ENV TARGET_PLATFORM debian
2222
ENV bazelVersion 3.0.0
2323

2424
RUN apt-get update && apt-get -y install \
25+
ant \
2526
automake \
2627
build-essential \
2728
cmake \

‎docker/compile/Dockerfile.ubuntu14.04

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ RUN add-apt-repository ppa:george-edison55/cmake-3.x
2727
RUN add-apt-repository ppa:openjdk-r/ppa
2828

2929
RUN apt-get update && apt-get -y install \
30+
ant \
3031
automake \
3132
build-essential \
3233
curl \

‎docker/compile/Dockerfile.ubuntu16.04

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN apt-get update && apt-get install -y software-properties-common
2626
RUN add-apt-repository ppa:openjdk-r/ppa
2727

2828
RUN apt-get update && apt-get -y install \
29+
ant \
2930
automake \
3031
build-essential \
3132
cmake \

‎docker/compile/Dockerfile.ubuntu18.04

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ ENV TARGET_PLATFORM ubuntu
2222
ENV bazelVersion 3.0.0
2323

2424
RUN apt-get update && apt-get -y install \
25+
ant \
2526
g++ \
2627
cmake \
2728
automake \

‎docker/compile/Dockerfile.ubuntu20.04

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV bazelVersion 3.0.0
2424
ARG DEBIAN_FRONTEND=noninteractive
2525

2626
RUN apt-get update && apt-get -y install \
27+
ant \
2728
g++ \
2829
cmake \
2930
automake \

‎docker/dist/Dockerfile.dist.centos7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ENV HERON_HOME /heron/heron-core/
5252
RUN export HERON_HOME
5353

5454
# install zookeeper
55-
ARG ZK_DIST=zookeeper-3.4.14
55+
ARG ZK_DIST=zookeeper-3.5.8
5656
ADD dist/scripts /opt/heron-docker/scripts
5757

5858
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST

‎docker/dist/Dockerfile.dist.debian10

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ENV HERON_HOME /heron/heron-core/
5252
RUN export HERON_HOME
5353

5454
# install zookeeper
55-
ARG ZK_DIST=zookeeper-3.4.14
55+
ARG ZK_DIST=zookeeper-3.5.8
5656
ADD dist/scripts /opt/heron-docker/scripts
5757

5858
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST

‎docker/dist/Dockerfile.dist.debian9

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ENV HERON_HOME /heron/heron-core/
5353
RUN export HERON_HOME
5454

5555
# install zookeeper
56-
ARG ZK_DIST=zookeeper-3.4.14
56+
ARG ZK_DIST=zookeeper-3.5.8
5757
ADD dist/scripts /opt/heron-docker/scripts
5858

5959
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST

‎docker/dist/Dockerfile.dist.ubuntu14.04

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ ENV HERON_HOME /heron/heron-core/
5757
RUN export HERON_HOME
5858

5959
# install zookeeper
60-
ARG ZK_DIST=zookeeper-3.4.14
60+
ARG ZK_DIST=zookeeper-3.5.8
6161
ADD dist/scripts /opt/heron-docker/scripts
6262

6363
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST

‎docker/dist/Dockerfile.dist.ubuntu16.04

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ ENV HERON_HOME /heron/heron-core/
6060
RUN export HERON_HOME
6161

6262
# install zookeeper
63-
ARG ZK_DIST=zookeeper-3.4.14
63+
ARG ZK_DIST=zookeeper-3.5.8
6464
ADD dist/scripts /opt/heron-docker/scripts
6565

6666
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST

‎docker/dist/Dockerfile.dist.ubuntu18.04

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ENV HERON_HOME /heron/heron-core/
5353
RUN export HERON_HOME
5454

5555
# install zookeeper
56-
ARG ZK_DIST=zookeeper-3.4.14
56+
ARG ZK_DIST=zookeeper-3.5.8
5757
ADD dist/scripts /opt/heron-docker/scripts
5858

5959
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST

‎docker/dist/Dockerfile.dist.ubuntu20.04

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ENV HERON_HOME /heron/heron-core/
5555
RUN export HERON_HOME
5656

5757
# install zookeeper
58-
ARG ZK_DIST=zookeeper-3.4.14
58+
ARG ZK_DIST=zookeeper-3.5.8
5959
ADD dist/scripts /opt/heron-docker/scripts
6060

6161
RUN sh /opt/heron-docker/scripts/install-zookeeper.sh $ZK_DIST

‎docker/dist/conf/zookeeper.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ autopurge.snapRetainCount=3
2424
# Purge task interval in hours
2525
# Set to "0" to disable auto purge feature
2626
autopurge.purgeInterval=1
27+
# Enable all four letter word commands by default
28+
4lw.commands.whitelist=*

‎docker/dist/scripts/install-zookeeper.sh

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,23 @@
1919
if [ "$#" -ne 1 ]; then
2020
echo "Usage: $0 zookeeper-<version-number>"
2121
echo "Example:"
22-
echo "$ $0 zookeeper-3.4.14"
22+
echo "$ $0 zookeeper-3.5.8"
2323
exit 1
2424
fi
2525

2626
ZK_DIST=$1
2727

28-
curl -O "https://archive.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz"
29-
tar -xzf ./$ZK_DIST.tar.gz -C /opt
30-
rm ./$ZK_DIST.tar.gz
28+
curl -O "https://archive.apache.org/dist/zookeeper/$ZK_DIST/apache-$ZK_DIST-bin.tar.gz"
29+
tar -xzf ./apache-$ZK_DIST-bin.tar.gz -C /opt
30+
rm ./apache-$ZK_DIST-bin.tar.gz
31+
32+
mv /opt/apache-$ZK_DIST-bin /opt/zookeeper
33+
rm -rf \
34+
/opt/zookeeper/README.txt \
35+
/opt/zookeeper/NOTICE.txt \
36+
/opt/zookeeper/README_packaging.txt \
37+
/opt/zookeeper/docs \
3138

32-
mv /opt/$ZK_DIST /opt/zookeeper
33-
rm -rf /opt/zookeeper/CHANGES.txt \
34-
/opt/zookeeper/README.txt \
35-
/opt/zookeeper/NOTICE.txt \
36-
/opt/zookeeper/CHANGES.txt \
37-
/opt/zookeeper/README_packaging.txt \
38-
/opt/zookeeper/build.xml \
39-
/opt/zookeeper/config \
40-
/opt/zookeeper/contrib \
41-
/opt/zookeeper/dist-maven \
42-
/opt/zookeeper/docs \
43-
/opt/zookeeper/ivy.xml \
44-
/opt/zookeeper/ivysettings.xml \
45-
/opt/zookeeper/recipes \
46-
/opt/zookeeper/src \
47-
/opt/zookeeper/$ZK_DIST.jar.asc \
48-
/opt/zookeeper/$ZK_DIST.jar.md5 \
49-
/opt/zookeeper/$ZK_DIST.jar.sha1
5039

5140
# copy zk scripts
5241
mkdir -p /opt/zookeeper/scripts
@@ -55,6 +44,6 @@ chmod +x /opt/heron-docker/scripts/generate-zookeeper-config.sh
5544
cp /opt/heron-docker/scripts/zookeeper-ruok.sh /opt/zookeeper/scripts/
5645
chmod +x /opt/heron-docker/scripts/zookeeper-ruok.sh
5746
cp /opt/heron-docker/scripts/start-zookeeper.sh /opt/zookeeper/scripts/
58-
chmod +x /opt/heron-docker/scripts/
47+
chmod +x /opt/heron-docker/scripts/start-zookeeper.sh
5948
cp /opt/heron-docker/scripts/wait-for-zookeeper.sh /opt/zookeeper/scripts/
6049
chmod +x /opt/heron-docker/scripts/wait-for-zookeeper.sh

‎heron/statemgrs/tests/java/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ zookeeper_statemgr_deps_files = [
2222
"//heron/statemgrs/src/java:zookeeper-statemgr-java",
2323
"@maven//:org_apache_curator_curator_framework",
2424
"@maven//:org_apache_zookeeper_zookeeper",
25+
"@maven//:org_apache_zookeeper_zookeeper_jute",
2526
]
2627

2728
localfs_deps_files = \

0 commit comments

Comments
 (0)