This is an automated email from the ASF dual-hosted git repository. vjasani pushed a commit to branch tmp-ec in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit ec412d830c4f775acca645212dd750e6349e13c1 Author: Viraj Jasani <[email protected]> AuthorDate: Mon Mar 16 11:06:28 2026 -0700 ignore test - too aggressive for jenkins builds --- .../org/apache/phoenix/schema/MetaDataClient.java | 4 ++++ .../phoenix/hbase/index/IndexCDCConsumer.java | 4 ++-- .../end2end/ConcurrentMutationsExtendedIndexIT.java | 2 ++ .../ConcurrentMutationsLazyPostBatchWriteIT.java | 8 ++++++++ .../end2end/IndexMaintainerConsistencyIT.java | 21 +++++++++++++++++++++ 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core-client/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index b1d2567d07..53f44687e8 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -1200,6 +1200,10 @@ public class MetaDataClient { continue; } + if (tableType == PTableType.INDEX && "CONSISTENCY".equalsIgnoreCase(prop.getFirst())) { + continue; + } + // HTableDescriptor property or Phoenix Table Property if (defaultDescriptor.getValue(Bytes.toBytes(prop.getFirst())) == null) { // See PHOENIX-4891 diff --git a/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexCDCConsumer.java b/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexCDCConsumer.java index 2fd66bae54..68bfbd6d7f 100644 --- a/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexCDCConsumer.java +++ b/phoenix-core-server/src/main/java/org/apache/phoenix/hbase/index/IndexCDCConsumer.java @@ -97,7 +97,7 @@ public class IndexCDCConsumer implements Runnable { public static final String INDEX_CDC_CONSUMER_BATCH_SIZE = "phoenix.index.cdc.consumer.batch.size"; - private static final int DEFAULT_CDC_BATCH_SIZE = 1000; + private static final int DEFAULT_CDC_BATCH_SIZE = 100; public static final String INDEX_CDC_CONSUMER_STARTUP_DELAY_MS = "phoenix.index.cdc.consumer.startup.delay.ms"; @@ -116,7 +116,7 @@ public class IndexCDCConsumer implements Runnable { */ public static final String INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS = "phoenix.index.cdc.consumer.timestamp.buffer.ms"; - private static final long DEFAULT_TIMESTAMP_BUFFER_MS = 25000; + private static final long DEFAULT_TIMESTAMP_BUFFER_MS = 10000; /** * Maximum number of retries when CDC events exist but the corresponding data table mutations are diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIndexIT.java index 531e036a9c..a04e48e1d5 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsExtendedIndexIT.java @@ -37,6 +37,7 @@ import org.apache.phoenix.util.EnvironmentEdgeManager; import org.apache.phoenix.util.TestUtil; import org.junit.Assume; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -172,6 +173,7 @@ public abstract class ConcurrentMutationsExtendedIndexIT extends ParallelStatsDi // This test is heavy and it might exhaust jenkins resources @Test(timeout = 1800000) + @Ignore("too aggressive for jenkins builds") public void testConcurrentUpsertsWithTableSplitsMerges() throws Exception { Assume.assumeFalse(uncovered); int nThreads = 13; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsLazyPostBatchWriteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsLazyPostBatchWriteIT.java index a6ecfa7e60..4c27c9b89e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsLazyPostBatchWriteIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentMutationsLazyPostBatchWriteIT.java @@ -17,6 +17,9 @@ */ package org.apache.phoenix.end2end; +import static org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_BATCH_SIZE; +import static org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS; + import java.util.Map; import org.apache.phoenix.coprocessor.PhoenixMasterObserver; import org.apache.phoenix.coprocessorclient.BaseScannerRegionObserverConstants; @@ -29,6 +32,9 @@ import org.junit.experimental.categories.Category; import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; +import static org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_BATCH_SIZE; +import static org.apache.phoenix.hbase.index.IndexCDCConsumer.INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS; + /** * Test class that extends ConcurrentMutationsExtendedIT with lazy post batch write enabled. */ @@ -51,6 +57,8 @@ public class ConcurrentMutationsLazyPostBatchWriteIT extends ConcurrentMutations props.put("phoenix.index.concurrent.wait.duration.ms", "10"); props.put(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB, Long.toString(2)); props.put(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB, Long.toString(1)); + props.put(INDEX_CDC_CONSUMER_BATCH_SIZE, Integer.toString(4500)); + props.put(INDEX_CDC_CONSUMER_TIMESTAMP_BUFFER_MS, Integer.toString(2500)); props.put("hbase.coprocessor.master.classes", PhoenixMasterObserver.class.getName()); setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); } diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexMaintainerConsistencyIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexMaintainerConsistencyIT.java index 8c529a1aad..26d231f0ea 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexMaintainerConsistencyIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexMaintainerConsistencyIT.java @@ -28,6 +28,9 @@ import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; import java.util.List; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.phoenix.coprocessor.generated.ServerCachingProtos; import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.jdbc.PhoenixConnection; @@ -105,6 +108,9 @@ public class IndexMaintainerConsistencyIT extends ParallelStatsDisabledIT { assertFalse(dataTable.isStrictTTL()); assertNull(dataTable.getIndexConsistency()); + verifyTableDescriptor(pconn, strongIndex1, strongIndex2, eventualIndex1, eventualIndex2, + dataTable); + IndexMaintainer strongMaintainer1 = strongIndex1.getIndexMaintainer(dataTable, pconn); IndexMaintainer strongMaintainer2 = strongIndex2.getIndexMaintainer(dataTable, pconn); IndexMaintainer eventualMaintainer1 = eventualIndex1.getIndexMaintainer(dataTable, pconn); @@ -172,6 +178,7 @@ public class IndexMaintainerConsistencyIT extends ParallelStatsDisabledIT { pconn.getTable(new PTableKey(pconn.getTenantId(), dataTableNameWithoutQuotes)); assertNull(strongIndex.getIndexConsistency()); assertFalse("Data table should not have CDC index initially", CDCUtil.hasCDCIndex(dataTable)); + verifyTableDescriptor(pconn, strongIndex, dataTable); IndexMaintainer strongMaintainer = strongIndex.getIndexMaintainer(dataTable, pconn); verifyIndexMaintainerConsistency(strongMaintainer, null, dataTable); @@ -185,6 +192,7 @@ public class IndexMaintainerConsistencyIT extends ParallelStatsDisabledIT { assertEquals(IndexConsistency.EVENTUAL, eventualIndex.getIndexConsistency()); assertTrue("Data table should have CDC index after altering to eventual consistency", CDCUtil.hasCDCIndex(dataTable)); + verifyTableDescriptor(pconn, eventualIndex, dataTable); IndexMaintainer eventualMaintainer = eventualIndex.getIndexMaintainer(dataTable, pconn); verifyIndexMaintainerConsistency(eventualMaintainer, IndexConsistency.EVENTUAL, dataTable); @@ -193,11 +201,24 @@ public class IndexMaintainerConsistencyIT extends ParallelStatsDisabledIT { PTable strongIdx = pconn.getTable(new PTableKey(pconn.getTenantId(), fullIdxNameWithoutQuotes)); assertEquals(IndexConsistency.STRONG, strongIdx.getIndexConsistency()); + verifyTableDescriptor(pconn, strongIdx, dataTable); IndexMaintainer strongIdxMaintainer = strongIdx.getIndexMaintainer(dataTable, pconn); verifyIndexMaintainerConsistency(strongIdxMaintainer, IndexConsistency.STRONG, dataTable); } } + private void verifyTableDescriptor(PhoenixConnection pconn, PTable... tables) throws Exception { + try (Admin admin = pconn.getQueryServices().getAdmin()) { + for (PTable table : tables) { + TableDescriptor td = + admin.getDescriptor(TableName.valueOf(table.getPhysicalName().getBytes())); + assertNull( + "CONSISTENCY should be present in table descriptor for " + table.getName().getString(), + td.getValue("CONSISTENCY")); + } + } + } + private void verifyIndexMaintainerConsistency(IndexMaintainer maintainer, IndexConsistency expectedConsistency, PTable dataTable) throws IOException { assertEquals(expectedConsistency, maintainer.getIndexConsistency());
