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

HBASE-24183 [flakey test] replication.TestAddToSerialReplicationPeer (#1514) (#1525) 

Signed-off-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: stack <stack@apache.org>
This commit is contained in:
huaxiangsun 2020-04-15 14:42:38 -07:00 committed by GitHub
parent 62c5bdcc08
commit efb5ff07ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestAddToSerialReplicationPeer.java
View File

@ -68,7 +68,8 @@ public class TestAddToSerialReplicationPeer extends SerialReplicationTestBase {
rollAllWALs(); rollAllWALs();
} }
private void waitUntilReplicatedToTheCurrentWALFile(HRegionServer rs) throws Exception { private void waitUntilReplicatedToTheCurrentWALFile(HRegionServer rs, final String oldWalName)
throws Exception {
Path path = ((AbstractFSWAL<?>) rs.getWAL(null)).getCurrentFileName(); Path path = ((AbstractFSWAL<?>) rs.getWAL(null)).getCurrentFileName();
String logPrefix = AbstractFSWALProvider.getWALPrefixFromWALName(path.getName()); String logPrefix = AbstractFSWALProvider.getWALPrefixFromWALName(path.getName());
UTIL.waitFor(30000, new ExplainingPredicate<Exception>() { UTIL.waitFor(30000, new ExplainingPredicate<Exception>() {
@ -77,7 +78,9 @@ public class TestAddToSerialReplicationPeer extends SerialReplicationTestBase {
public boolean evaluate() throws Exception { public boolean evaluate() throws Exception {
ReplicationSourceManager manager = ReplicationSourceManager manager =
((Replication) rs.getReplicationSourceService()).getReplicationManager(); ((Replication) rs.getReplicationSourceService()).getReplicationManager();
return manager.getWALs().get(PEER_ID).get(logPrefix).size() == 1; // Make sure replication moves to the new file.
return (manager.getWALs().get(PEER_ID).get(logPrefix).size() == 1) &&
!oldWalName.equals(manager.getWALs().get(PEER_ID).get(logPrefix).first());
} }
@Override @Override
@ -124,10 +127,14 @@ public class TestAddToSerialReplicationPeer extends SerialReplicationTestBase {
RegionInfo region = UTIL.getAdmin().getRegions(tableName).get(0); RegionInfo region = UTIL.getAdmin().getRegions(tableName).get(0);
HRegionServer srcRs = UTIL.getRSForFirstRegionInTable(tableName); HRegionServer srcRs = UTIL.getRSForFirstRegionInTable(tableName);
// Get the current wal file name
String walFileNameBeforeRollover =
((AbstractFSWAL<?>) srcRs.getWAL(null)).getCurrentFileName().getName();
HRegionServer rs = UTIL.getOtherRegionServer(srcRs); HRegionServer rs = UTIL.getOtherRegionServer(srcRs);
moveRegionAndArchiveOldWals(region, rs); moveRegionAndArchiveOldWals(region, rs);
waitUntilReplicationDone(100); waitUntilReplicationDone(100);
waitUntilReplicatedToTheCurrentWALFile(srcRs); waitUntilReplicatedToTheCurrentWALFile(srcRs, walFileNameBeforeRollover);
UTIL.getAdmin().disableReplicationPeer(PEER_ID); UTIL.getAdmin().disableReplicationPeer(PEER_ID);
UTIL.getAdmin().updateReplicationPeerConfig(PEER_ID, UTIL.getAdmin().updateReplicationPeerConfig(PEER_ID,
@ -160,8 +167,16 @@ public class TestAddToSerialReplicationPeer extends SerialReplicationTestBase {
RegionInfo region = UTIL.getAdmin().getRegions(tableName).get(0); RegionInfo region = UTIL.getAdmin().getRegions(tableName).get(0);
HRegionServer srcRs = UTIL.getRSForFirstRegionInTable(tableName); HRegionServer srcRs = UTIL.getRSForFirstRegionInTable(tableName);
HRegionServer rs = UTIL.getOtherRegionServer(srcRs); HRegionServer rs = UTIL.getOtherRegionServer(srcRs);
// Get the current wal file name
String walFileNameBeforeRollover =
((AbstractFSWAL<?>) srcRs.getWAL(null)).getCurrentFileName().getName();
moveRegionAndArchiveOldWals(region, rs); moveRegionAndArchiveOldWals(region, rs);
waitUntilReplicatedToTheCurrentWALFile(rs);
// Make sure that the replication done for the oldWal at source rs.
waitUntilReplicatedToTheCurrentWALFile(srcRs, walFileNameBeforeRollover);
UTIL.getAdmin().disableReplicationPeer(PEER_ID); UTIL.getAdmin().disableReplicationPeer(PEER_ID);
UTIL.getAdmin().updateReplicationPeerConfig(PEER_ID, UTIL.getAdmin().updateReplicationPeerConfig(PEER_ID,
ReplicationPeerConfig.newBuilder(peerConfig) ReplicationPeerConfig.newBuilder(peerConfig)