HBASE-20775 TestMultiParallel is flakey
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/14087cc9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/14087cc9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/14087cc9 Branch: refs/heads/HBASE-19064 Commit: 14087cc919da9f2e0b1a68f701f6365ad9d1d71f Parents: 177458d Author: zhangduo <zhang...@apache.org> Authored: Fri Jun 22 16:44:36 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Fri Jun 22 21:32:07 2018 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/client/ConnectionImplementation.java | 11 +++++++---- hbase-server/pom.xml | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/14087cc9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java index 53e4b7f..1176cbd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java @@ -799,6 +799,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable { s.setConsistency(Consistency.TIMELINE); } int maxAttempts = (retry ? numTries : 1); + boolean relocateMeta = false; for (int tries = 0; ; tries++) { if (tries >= maxAttempts) { throw new NoServerForRegionException("Unable to find region for " @@ -825,6 +826,10 @@ class ConnectionImplementation implements ClusterConnection, Closeable { return locations; } } + if (relocateMeta) { + relocateRegion(TableName.META_TABLE_NAME, HConstants.EMPTY_START_ROW, + RegionInfo.DEFAULT_REPLICA_ID); + } s.resetMvccReadPoint(); try (ReversedClientScanner rcs = new ReversedClientScanner(conf, s, TableName.META_TABLE_NAME, this, rpcCallerFactory, @@ -904,10 +909,8 @@ class ConnectionImplementation implements ClusterConnection, Closeable { throw e; } // Only relocate the parent region if necessary - if(!(e instanceof RegionOfflineException || - e instanceof NoServerForRegionException)) { - relocateRegion(TableName.META_TABLE_NAME, metaStartKey, replicaId); - } + relocateMeta = + !(e instanceof RegionOfflineException || e instanceof NoServerForRegionException); } finally { userRegionLock.unlock(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/14087cc9/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index e9daf93..473b740 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -19,6 +19,7 @@ * limitations under the License. */ --> +<!-- for testing --> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>hbase-build-configuration</artifactId>
