Merge pull request #3370 from sougou/build

zookeeper: 3.4.6->3.4.10

bootstrap.sh

@@ -67,7 +67,8 @@ fi
 ln -snf $protoc_dist/bin/protoc $VTROOT/bin/protoc
 
 # install zookeeper
-zk_ver=3.4.6
+# TODO(sougou): when version changes, see if we can drop the 'zip -d' hack to get the fatjars working.
+zk_ver=3.4.10
 zk_dist=$VTROOT/dist/vt-zookeeper-$zk_ver
 if [ -f $zk_dist/.build_finished ]; then
   echo "skipping zookeeper build. remove $zk_dist to force rebuild."
@@ -78,6 +79,7 @@ else
     tar -xzf zookeeper-$zk_ver.tar.gz && \
     mkdir -p $zk_dist/lib && \
     cp zookeeper-$zk_ver/contrib/fatjar/zookeeper-$zk_ver-fatjar.jar $zk_dist/lib && \
+    zip -d $zk_dist/lib/zookeeper-$zk_ver-fatjar.jar 'META-INF/*.SF' 'META-INF/*.RSA' 'META-INF/*SF' && \
     rm -rf zookeeper-$zk_ver zookeeper-$zk_ver.tar.gz)
   [ $? -eq 0 ] || fail "zookeeper build failed"
   touch $zk_dist/.build_finished

docker/bootstrap/Dockerfile.common

@@ -26,6 +26,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     virtualenv \
     unzip \
     xvfb \
+    zip \
     # gRPC PHP requirements \
     libz-dev \
     php-pear \

docs/getting-started/local-instance/index.html

@@ -445,10 +445,11 @@ on your path.</li>
 <li>bison</li>
 <li>curl</li>
 <li>unzip</li>
+<li>zip</li>
 </ul>
 
 <p>These can be installed with the following apt-get command:</p>
-<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>sudo apt-get install make automake libtool python-dev python-virtualenv python-mysqldb libssl-dev g++ git pkg-config bison curl unzip
+<div class="highlight"><pre><code class="language-sh" data-lang="sh"><span class="nv">$ </span>sudo apt-get install make automake libtool python-dev python-virtualenv python-mysqldb libssl-dev g++ git pkg-config bison curl unzip zip
 </code></pre></div></li>
 <li><p>If you decided to use ZooKeeper in step 3, you also need to install a
 Java Runtime, such as OpenJDK.</p>

go/zk/zkctl/zksrv.sh

@@ -21,7 +21,7 @@ logdir="$1"
 config="$2"
 pidfile="$3"
 
-zk_ver=3.4.6
+zk_ver=3.4.10
 classpath="$VTROOT/dist/vt-zookeeper-$zk_ver/lib/zookeeper-$zk_ver-fatjar.jar:/usr/local/lib/zookeeper-$zk_ver-fatjar.jar:/usr/share/java/zookeeper-$zk_ver.jar"
 
 mkdir -p "$logdir"