You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/04/27 20:28:10 UTC
hbase git commit: HBASE-15719
TestMasterCoprocessorExceptionWithAbort#testExceptionFromCoprocessorWhenCreatingTable
fails due to premature master abortion
Repository: hbase
Updated Branches:
refs/heads/HBASE-7912 8b964727d -> 2ea1cc423
HBASE-15719 TestMasterCoprocessorExceptionWithAbort#testExceptionFromCoprocessorWhenCreatingTable fails due to premature master abortion
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2ea1cc42
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2ea1cc42
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2ea1cc42
Branch: refs/heads/HBASE-7912
Commit: 2ea1cc4234891c60026dd4447655f88656b65835
Parents: 8b96472
Author: tedyu <yu...@gmail.com>
Authored: Wed Apr 27 11:27:55 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Apr 27 11:27:55 2016 -0700
----------------------------------------------------------------------
.../hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java | 1 +
.../hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2ea1cc42/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
index 061068c..4a10ff9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
@@ -107,6 +107,7 @@ public class TestMasterCoprocessorExceptionWithAbort {
HTableDescriptor desc, HRegionInfo[] regions) throws IOException {
// cause a NullPointerException and don't catch it: this will cause the
// master to abort().
+ if (desc.getTableName().isSystemTable()) return;
Integer i;
i = null;
i = i++;
http://git-wip-us.apache.org/repos/asf/hbase/blob/2ea1cc42/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
index 5048c73..8534b6b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
@@ -85,6 +85,7 @@ public class TestMasterCoprocessorExceptionWithRemove {
// Cause a NullPointerException and don't catch it: this should cause the
// master to throw an o.apache.hadoop.hbase.DoNotRetryIOException to the
// client.
+ if (desc.getTableName().isSystemTable()) return;
Integer i;
i = null;
i = i++;