You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/10/23 05:55:03 UTC
[hbase] branch HBASE-26393 updated (c8d19bd -> 49d6192)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch HBASE-26393
in repository https://gitbox.apache.org/repos/asf/hbase.git.
discard c8d19bd HBASE-26393 The dockerfile for running pre commit and nightly jobs can not be built on branch-1
new 49d6192 HBASE-26393 The dockerfile for running pre commit and nightly jobs can not be built on branch-1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c8d19bd)
\
N -- N -- N refs/heads/HBASE-26393 (49d6192)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java | 2 +-
pom.xml | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
[hbase] 01/01: HBASE-26393 The dockerfile for running pre commit
and nightly jobs can not be built on branch-1
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch HBASE-26393
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 49d61923443359d8ac6d7030e99cc1b101796624
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Sat Oct 23 13:54:08 2021 +0800
HBASE-26393 The dockerfile for running pre commit and nightly jobs can not be built on branch-1
---
dev-support/docker/Dockerfile | 11 ++++++-----
.../hbase/regionserver/TestRegionProcessRowsWithLocks.java | 2 +-
pom.xml | 2 ++
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 5dbe2ba..0eb0fc3 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -19,7 +19,7 @@
# See BUILDING.txt.
-FROM ubuntu:trusty
+FROM ubuntu:18.04
WORKDIR /root
@@ -63,10 +63,12 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
pylint \
python-dateutil \
rsync \
- snappy \
+ libsnappy-dev \
xz-utils \
zlib1g-dev \
- wget
+ wget \
+ gpg \
+ dirmngr
####
# Apps that require Java.
@@ -90,13 +92,12 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
RUN echo "dot_style = mega" > "/root/.wgetrc"
RUN echo "quiet = on" >> "/root/.wgetrc"
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-get -q update && apt-get -q install --no-install-recommends -y software-properties-common
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 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
ENV JAVA_HOME /usr/lib/jvm/zulu-7-amd64
# Fixing the Apache commons / Maven dependency problem under Ubuntu:
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java
index 227faf9..e4c38e7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java
@@ -172,7 +172,7 @@ public class TestRegionProcessRowsWithLocks {
try {
incrementCounter(table);
Assert.fail("Should throw IOException.");
- } catch (Throwable e) {
+ } catch (IOException e) {
}
long endMemstoreSize = region.getMemstoreSize();
diff --git a/pom.xml b/pom.xml
index 8a266e8..d9ef886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -739,6 +739,8 @@
<exclude>**/rat.txt</exclude>
<!-- hbase-error-prone module is in a profile which is not used for rat check -->
<exclude>hbase-error-prone/target/**</exclude>
+ <!-- when using jdk7, hbase-thrift module will not be used for rat check -->
+ <exclude>hbase-thrift/target/**</exclude>
</excludes>
</configuration>
</plugin>