Repository: hbase Updated Branches: refs/heads/master bc4f25ff4 -> ef35182f1
HBASE-12166 TestDistributedLogSplitting.testMasterStartsUpWithLogReplayWork Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ef35182f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ef35182f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ef35182f Branch: refs/heads/master Commit: ef35182f1fcb8e23566e66211f78eb5200168122 Parents: bc4f25f Author: Jimmy Xiang <[email protected]> Authored: Fri Oct 3 14:06:49 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Fri Oct 3 17:18:12 2014 -0700 ---------------------------------------------------------------------- .../hbase/coordination/ZKSplitLogManagerCoordination.java | 10 +++++----- .../TestRegionReplicaReplicationEndpoint.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ef35182f/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java index 07986f2..2983276 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java @@ -341,8 +341,8 @@ public class ZKSplitLogManagerCoordination extends ZooKeeperListener implements if (recoveredServerNameSet.containsAll(failedServers)) { ZKUtil.deleteNodeRecursively(watcher, nodePath); } else { - listSize = failedServers.size(); - for (int j = 0; j < listSize; j++) { + int tmpFailedServerSize = failedServers.size(); + for (int j = 0; j < tmpFailedServerSize; j++) { String failedServer = failedServers.get(j); if (recoveredServerNameSet.contains(failedServer)) { String tmpPath = ZKUtil.joinZNode(nodePath, failedServer); @@ -733,9 +733,9 @@ public class ZKSplitLogManagerCoordination extends ZooKeeperListener implements continue; } boolean needMoreRecovery = false; - listSize = regionFailedServers.size(); - for (i = 0; i < listSize; i++) { - if (knownFailedServers.contains(regionFailedServers.get(i))) { + int tmpFailedServerSize = regionFailedServers.size(); + for (int j = 0; j < tmpFailedServerSize; j++) { + if (knownFailedServers.contains(regionFailedServers.get(j))) { needMoreRecovery = true; break; } http://git-wip-us.apache.org/repos/asf/hbase/blob/ef35182f/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java index b54c38c..6d5a3c9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java @@ -161,7 +161,7 @@ public class TestRegionReplicaReplicationEndpoint { // load the data to the table HTU.loadNumericRows(table, HBaseTestingUtility.fam1, 0, 1000); - verifyReplication(tableName, regionReplication, 0, 1000); + verifyReplication(tableName, regionReplication, 0, 6000); } finally { table.close(); @@ -334,7 +334,7 @@ public class TestRegionReplicaReplicationEndpoint { // now enable the replication admin.enablePeer(ServerRegionReplicaUtil.getReplicationPeerId()); - verifyReplication(tableName, regionReplication, 0, 1000); + verifyReplication(tableName, regionReplication, 0, 6000); } finally { admin.close();
