From 04e67967eff82a673b3850059cc3b257690bff3b Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Sat, 25 Nov 2017 20:07:12 -0800 Subject: [PATCH] HBASE-19024 branch-1.2 times out and is taking 6-7 hours to complete; NOTHING CHANGE JUST TO PROVOKE A 1.2 BUILD --- dev-support/docker/Dockerfile | 21 ++++++++++++++++++++- hbase-server/pom.xml | 2 +- .../org/apache/hadoop/hbase/InterProcessLock.java | 1 - 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index 2605e2c010..e4a3a4c67b 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -64,7 +64,21 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ snappy \ zlib1g-dev \ wget \ - openjdk-7-jdk + software-properties-common\ + python-software-properties + +####### +# Add Azul repo +####### +# The jdk7 in trusty is 151 which hdfs hangs on. Add the azul repo and install +# zulu-7, an openjdk that is more recent than trusty default jdk. We add the repo +# up here and then down below when we do OpenJDK 7, we run install (after the +# jdk 8 apt-get update). We were getting apt-add-repository 'command not found' +# so do the apt-get software-properties-common. See +# http://lifeonubuntu.com/ubuntu-missing-add-apt-repository-command/ +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 +RUN apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main' + ####### # OpenJDK 8 @@ -80,6 +94,11 @@ RUN apt-get -q install --no-install-recommends -y openjdk-8-jdk RUN update-alternatives --config java RUN update-alternatives --config javac +####### +# OpenJDK 7 +####### +RUN apt-get install zulu-7 + #### # Apps that require Java ### diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 81e529f4f7..f989aa2693 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -37,7 +37,7 @@ + by placing this first. --> diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/InterProcessLock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/InterProcessLock.java index d1216f1e4f..43e566573d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/InterProcessLock.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/InterProcessLock.java @@ -28,7 +28,6 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public interface InterProcessLock { - /** * Acquire the lock, waiting indefinitely until the lock is released or * the thread is interrupted. -- 2.11.0 (Apple Git-81)