Repository: hbase Updated Branches: refs/heads/branch-1 03bb55098 -> 12fd6d2a2
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/12fd6d2a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/12fd6d2a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/12fd6d2a Branch: refs/heads/branch-1 Commit: 12fd6d2a2495533726d84759fd6cc754b5f7eb97 Parents: 03bb550 Author: Jimmy Xiang <[email protected]> Authored: Fri Oct 3 14:06:49 2014 -0700 Committer: Jimmy Xiang <[email protected]> Committed: Fri Oct 3 17:20:28 2014 -0700 ---------------------------------------------------------------------- .../hbase/coordination/ZKSplitLogManagerCoordination.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/12fd6d2a/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; }
