From 868382f247dd47de208340d459b016bdbcb12595 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 | 42 ++++++++++++++-------- hbase-server/pom.xml | 2 +- .../org/apache/hadoop/hbase/InterProcessLock.java | 1 - 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index 2605e2c010..cfe42667b6 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -63,29 +63,43 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ rsync \ snappy \ zlib1g-dev \ - wget \ - openjdk-7-jdk + wget + +#### +# Apps that require Java +# Pulls down latest headless jdk7 even though we don't want it. See below +# where we install the jdks we want. +### +RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ + ant \ + maven ####### -# OpenJDK 8 +# Install jdk7 and jdk8. ####### - +# We use jdk8 to compile for a jdk7 target. Both jdk7 and jkd8 need to be installed +# because we look for the jdk tools dependency to be in place at /usr/lib/jvm/java-7*. +# The maven/ant build above will put in place a headless jre 7 but it is a jdk7 from +# trusty which is build 151, a jvm hdfs hangs on. Add the azul repo and install zulu-7 +# and zulu-8, openjdks that are more recent than trusty's default jdk (161). We add +# azul repo because no other openjdk available for trusty ubuntu that is more recent +# than the version 151. We need to symlink to the zulu jvms so yetus and all +# continues to work (it looks for java-* in /usr/lib/jvm setting JAVA_HOME). RUN echo "dot_style = mega" > "/root/.wgetrc" RUN echo "quiet = on" >> "/root/.wgetrc" - -RUN apt-get -q update && apt-get -q install --no-install-recommends -y software-properties-common -RUN add-apt-repository -y ppa:openjdk-r/ppa +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 +RUN apt-get -q update && apt-get -q install --no-install-recommends -y software-properties-common python-software-properties +RUN apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main' RUN apt-get -q update -RUN apt-get -q install --no-install-recommends -y openjdk-8-jdk +RUN apt-get -q install --no-install-recommends -y zulu-8 zulu-7 RUN update-alternatives --config java RUN update-alternatives --config javac +RUN mv /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/moved.java-7-openjdk-amd64 +# Move the zulu jdks into place else yetus can't find them. Symlink won't work. +# Yetus does find -type d. +RUN mv /usr/lib/jvm/zulu-7-amd64 /usr/lib/jvm/java-7-openjdk-amd64 +RUN mv /usr/lib/jvm/zulu-8-amd64 /usr/lib/jvm/java-8-openjdk-amd64 -#### -# Apps that require Java -### -RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ - ant \ - maven # Fixing the Apache commons / Maven dependency problem under Ubuntu: # See http://wiki.apache.org/commons/VfsProblems 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)