Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12166 TestDistributedLogSplitting.testMasterStartsUpWithLogReplayWork

Browse Source
This commit is contained in:
Jimmy Xiang 2014-10-03 14:06:49 -07:00
parent bc4f25ff45
commit ef35182f1f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
View File

@ -341,8 +341,8 @@ public class ZKSplitLogManagerCoordination extends ZooKeeperListener implements
if (recoveredServerNameSet.containsAll(failedServers)) { if (recoveredServerNameSet.containsAll(failedServers)) {
ZKUtil.deleteNodeRecursively(watcher, nodePath); ZKUtil.deleteNodeRecursively(watcher, nodePath);
} else { } else {
listSize = failedServers.size(); int tmpFailedServerSize = failedServers.size();
for (int j = 0; j < listSize; j++) { for (int j = 0; j < tmpFailedServerSize; j++) {
String failedServer = failedServers.get(j); String failedServer = failedServers.get(j);
if (recoveredServerNameSet.contains(failedServer)) { if (recoveredServerNameSet.contains(failedServer)) {
String tmpPath = ZKUtil.joinZNode(nodePath, failedServer); String tmpPath = ZKUtil.joinZNode(nodePath, failedServer);
@ -733,9 +733,9 @@ public class ZKSplitLogManagerCoordination extends ZooKeeperListener implements
continue; continue;
} }
boolean needMoreRecovery = false; boolean needMoreRecovery = false;
listSize = regionFailedServers.size(); int tmpFailedServerSize = regionFailedServers.size();
for (i = 0; i < listSize; i++) { for (int j = 0; j < tmpFailedServerSize; j++) {
if (knownFailedServers.contains(regionFailedServers.get(i))) { if (knownFailedServers.contains(regionFailedServers.get(j))) {
needMoreRecovery = true; needMoreRecovery = true;
break; break;
} }

4
hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java
View File

@ -161,7 +161,7 @@ public class TestRegionReplicaReplicationEndpoint {
// load the data to the table // load the data to the table
HTU.loadNumericRows(table, HBaseTestingUtility.fam1, 0, 1000); HTU.loadNumericRows(table, HBaseTestingUtility.fam1, 0, 1000);
verifyReplication(tableName, regionReplication, 0, 1000); verifyReplication(tableName, regionReplication, 0, 6000);
} finally { } finally {
table.close(); table.close();
@ -334,7 +334,7 @@ public class TestRegionReplicaReplicationEndpoint {
// now enable the replication // now enable the replication
admin.enablePeer(ServerRegionReplicaUtil.getReplicationPeerId()); admin.enablePeer(ServerRegionReplicaUtil.getReplicationPeerId());
verifyReplication(tableName, regionReplication, 0, 1000); verifyReplication(tableName, regionReplication, 0, 6000);
} finally { } finally {
admin.close(); admin.close();