(phoenix) branch master updated: PHOENIX-7671 Fix CDCStreamIT for HBase 2.6

[vjasani]

This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new 410ddef9ff PHOENIX-7671 Fix CDCStreamIT for HBase 2.6
410ddef9ff is described below

commit 410ddef9ffb1317bcc6a204f1481170b1ad7f3db
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Mon Jul 28 12:41:36 2025 -0700

    PHOENIX-7671 Fix CDCStreamIT for HBase 2.6
---
 .../org/apache/phoenix/end2end/CDCStreamIT.java     | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCStreamIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCStreamIT.java
index 21efcca9cb..964e489d6c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCStreamIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCStreamIT.java
@@ -137,8 +137,12 @@ public class CDCStreamIT extends CDCBaseIT {
       verifyPreAndPostImages(conn, sql, expiry);
 
       injectEdge.incrementValue(TimeUnit.DAYS.toMillis(1));
-      TestUtil.doMajorCompaction(conn, tableName);
-      TestUtil.doMajorCompaction(conn, CDCUtil.getCDCIndexName(cdcName));
+      EnvironmentEdgeManager.reset();
+      TestUtil.flush(getUtility(), TableName.valueOf(tableName));
+      TestUtil.flush(getUtility(), 
TableName.valueOf(CDCUtil.getCDCIndexName(cdcName)));
+      EnvironmentEdgeManager.injectEdge(injectEdge);
+      TestUtil.majorCompact(getUtility(), TableName.valueOf(tableName));
+      TestUtil.majorCompact(getUtility(), 
TableName.valueOf(CDCUtil.getCDCIndexName(cdcName)));
 
       // first compaction will expire initial insert event as we are already 
past
       // (3 days + 100 sec + 24 hr), however this should not generate ttl 
expired event yet,
@@ -146,8 +150,12 @@ public class CDCStreamIT extends CDCBaseIT {
       verifyImagesAfterFirstCompaction(conn, sql, expiry);
 
       injectEdge.incrementValue(TimeUnit.HOURS.toMillis(3) + 
TimeUnit.SECONDS.toMillis(1));
-      TestUtil.doMajorCompaction(conn, tableName);
-      TestUtil.doMajorCompaction(conn, CDCUtil.getCDCIndexName(cdcName));
+      EnvironmentEdgeManager.reset();
+      TestUtil.flush(getUtility(), TableName.valueOf(tableName));
+      TestUtil.flush(getUtility(), 
TableName.valueOf(CDCUtil.getCDCIndexName(cdcName)));
+      EnvironmentEdgeManager.injectEdge(injectEdge);
+      TestUtil.majorCompact(getUtility(), TableName.valueOf(tableName));
+      TestUtil.majorCompact(getUtility(), 
TableName.valueOf(CDCUtil.getCDCIndexName(cdcName)));
 
       // The compaction after (3 days + 100 sec + 24 hr + 3 hr + 1 sec) should 
expire the
       // row, which was last updated (24 hr + 3 hr + 1 sec) in the past.
@@ -214,7 +222,10 @@ public class CDCStreamIT extends CDCBaseIT {
       verifyPreAndPostImages(conn, sql, expiry);
 
       injectEdge.incrementValue(TimeUnit.DAYS.toMillis(1));
-      TestUtil.doMajorCompaction(conn, CDCUtil.getCDCIndexName(cdcName));
+      EnvironmentEdgeManager.reset();
+      TestUtil.flush(getUtility(), 
TableName.valueOf(CDCUtil.getCDCIndexName(cdcName)));
+      EnvironmentEdgeManager.injectEdge(injectEdge);
+      TestUtil.majorCompact(getUtility(), 
TableName.valueOf(CDCUtil.getCDCIndexName(cdcName)));
 
       // compaction will expire all rows from CDC index because the 
maxLookback of
       // CDC index is no longer 27 hr, but it has been altered to 50 sec