You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ja...@apache.org on 2025/06/23 16:50:22 UTC
(pinot) branch master updated: Change wait condition to fix flaky test (#16141)
This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 43f2c446d5 Change wait condition to fix flaky test (#16141)
43f2c446d5 is described below
commit 43f2c446d5db1f04e132452292840520aa7079bc
Author: Abhishek Bafna <ab...@startree.ai>
AuthorDate: Mon Jun 23 22:20:16 2025 +0530
Change wait condition to fix flaky test (#16141)
---
.../apache/pinot/common/config/provider/LogicalTableMetadataCache.java | 3 ++-
.../apache/pinot/controller/helix/LogicalTableMetadataCacheTest.java | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/config/provider/LogicalTableMetadataCache.java b/pinot-common/src/main/java/org/apache/pinot/common/config/provider/LogicalTableMetadataCache.java
index 62982ea680..fc6f0e05b5 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/config/provider/LogicalTableMetadataCache.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/config/provider/LogicalTableMetadataCache.java
@@ -246,7 +246,7 @@ public class LogicalTableMetadataCache {
try {
LogicalTableConfig logicalTableConfig = LogicalTableConfigUtils.fromZNRecord(znRecord);
String logicalTableName = logicalTableConfig.getTableName();
- LogicalTableConfig oldLogicalTableConfig = _logicalTableConfigMap.put(logicalTableName, logicalTableConfig);
+ LogicalTableConfig oldLogicalTableConfig = _logicalTableConfigMap.get(logicalTableName);
Preconditions.checkArgument(oldLogicalTableConfig != null,
"Logical table config for logical table: %s should have been created before", logicalTableName);
@@ -269,6 +269,7 @@ public class LogicalTableMetadataCache {
&& !logicalTableConfig.getRefRealtimeTableName().equals(oldLogicalTableConfig.getRefRealtimeTableName())) {
addTableConfig(logicalTableConfig.getRefRealtimeTableName(), logicalTableName);
}
+ _logicalTableConfigMap.put(logicalTableName, logicalTableConfig);
LOGGER.info("Updated the logical table config: {} in cache", logicalTableName);
} catch (Exception e) {
LOGGER.error("Caught exception while refreshing logical table for ZNRecord: {}", znRecord.getId(), e);
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/LogicalTableMetadataCacheTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/LogicalTableMetadataCacheTest.java
index db459e9aff..6b8434d3ed 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/LogicalTableMetadataCacheTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/LogicalTableMetadataCacheTest.java
@@ -187,9 +187,8 @@ public class LogicalTableMetadataCacheTest {
assertNotEquals(CACHE.getLogicalTableConfig(logicalTableName), logicalTableConfig);
INSTANCE.updateLogicalTableConfig(logicalTableConfig);
-
TestUtils.waitForCondition(
- aVoid -> CACHE.getLogicalTableConfig(logicalTableName).equals(logicalTableConfig),
+ aVoid -> Objects.requireNonNull(CACHE.getLogicalTableConfig(logicalTableName)).equals(logicalTableConfig),
10_000L, "Logical table config not updated in cache");
assertNotNull(CACHE.getTableConfig(_extraOfflineTableConfig.getTableName()));
assertNotNull(CACHE.getTableConfig(_extraRealtimeTableConfig.getTableName()));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org