From 8546ef9c22a70abcb88777df2900ddad372ec748 Mon Sep 17 00:00:00 2001 From: Yang Chen <583334298@qq.com> Date: Sun, 29 Aug 2021 13:52:52 +0800 Subject: [PATCH 1/5] Clean shared state pollution to avoid flaky tests. --- .../regionserver/TestDrainReplicationQueuesForStandBy.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java index 5da7870dc385..a5386f96198a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java @@ -114,5 +114,7 @@ public String explainFailure() throws Exception { for (int i = 0; i < 100; i++) { assertTrue(region2.get(new Get(Bytes.toBytes(i))).isEmpty()); } + UTIL2.getAdmin().transitReplicationPeerSyncReplicationState(PEER_ID, + SyncReplicationState.DOWNGRADE_ACTIVE); } } \ No newline at end of file From 49ed99c1a1e50adf486f5446307abac35e884c08 Mon Sep 17 00:00:00 2001 From: Yang Chen <56383562+LALAYANG@users.noreply.github.com> Date: Tue, 9 Nov 2021 22:37:24 +0800 Subject: [PATCH 2/5] Update TestDrainReplicationQueuesForStandBy.java --- .../TestDrainReplicationQueuesForStandBy.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java index a5386f96198a..367b4068ccee 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java @@ -114,7 +114,12 @@ public String explainFailure() throws Exception { for (int i = 0; i < 100; i++) { assertTrue(region2.get(new Get(Bytes.toBytes(i))).isEmpty()); } - UTIL2.getAdmin().transitReplicationPeerSyncReplicationState(PEER_ID, + + @After + public void tearDown() throws Exception { + UTIL2.getAdmin().transitReplicationPeerSyncReplicationState(PEER_ID, SyncReplicationState.DOWNGRADE_ACTIVE); + } + } -} \ No newline at end of file +} From 8f8866e4970a8cf353a019d2dc4fd03eb96631b6 Mon Sep 17 00:00:00 2001 From: Yang Chen <56383562+LALAYANG@users.noreply.github.com> Date: Tue, 9 Nov 2021 23:13:47 +0800 Subject: [PATCH 3/5] Update TestDrainReplicationQueuesForStandBy.java --- .../regionserver/TestDrainReplicationQueuesForStandBy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java index 367b4068ccee..364a5e99c618 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java @@ -114,12 +114,12 @@ public String explainFailure() throws Exception { for (int i = 0; i < 100; i++) { assertTrue(region2.get(new Get(Bytes.toBytes(i))).isEmpty()); } - - @After + + @After public void tearDown() throws Exception { UTIL2.getAdmin().transitReplicationPeerSyncReplicationState(PEER_ID, SyncReplicationState.DOWNGRADE_ACTIVE); } - + } } From cbc56d2bcf3951a0b95faac0b40dae6e7874ed52 Mon Sep 17 00:00:00 2001 From: Yang Chen <56383562+LALAYANG@users.noreply.github.com> Date: Tue, 9 Nov 2021 23:21:15 +0800 Subject: [PATCH 4/5] Update TestDrainReplicationQueuesForStandBy.java --- .../regionserver/TestDrainReplicationQueuesForStandBy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java index 364a5e99c618..5512533cfcbe 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java @@ -114,6 +114,7 @@ public String explainFailure() throws Exception { for (int i = 0; i < 100; i++) { assertTrue(region2.get(new Get(Bytes.toBytes(i))).isEmpty()); } + } @After public void tearDown() throws Exception { @@ -121,5 +122,4 @@ public void tearDown() throws Exception { SyncReplicationState.DOWNGRADE_ACTIVE); } - } } From 0694cdc5ed6fd4d2c3d80f91aa4bc7dcf50ac021 Mon Sep 17 00:00:00 2001 From: Yang Chen <56383562+LALAYANG@users.noreply.github.com> Date: Wed, 10 Nov 2021 01:40:29 +0800 Subject: [PATCH 5/5] Update TestDrainReplicationQueuesForStandBy.java --- .../regionserver/TestDrainReplicationQueuesForStandBy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java index 5512533cfcbe..400af82ce6d3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestDrainReplicationQueuesForStandBy.java @@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.wal.AbstractFSWALProvider; +import org.junit.After; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -117,7 +118,7 @@ public String explainFailure() throws Exception { } @After - public void tearDown() throws Exception { + public void clean() throws Exception { UTIL2.getAdmin().transitReplicationPeerSyncReplicationState(PEER_ID, SyncReplicationState.DOWNGRADE_ACTIVE); }