mqliang commented on a change in pull request #7368: URL: https://github.com/apache/pinot/pull/7368#discussion_r718887723
########## File path: pinot-plugins/pinot-minion-tasks/pinot-minion-builtin-tasks/src/main/java/org/apache/pinot/plugin/minion/tasks/mergerollup/MergeRollupTaskGenerator.java ########## @@ -339,6 +351,21 @@ public String getTaskType() { .info("Finished generating task configs for table: {} for task: {}, numTasks: {}", offlineTableName, taskType, pinotTaskConfigsForTable.size()); } + + // Reset watermarks for invalid tables. This covers the metrics clean up when the table is removed or the merge + // config is added and then removed. + LeadControllerManager leadControllerManager = _clusterInfoAccessor.getLeaderControllerManager(); Review comment: L385-L268 can be changed as ``` for (String tableNameWithType : _mergeRollupWatermarks.keySet()) { if (!leadControllerManager.isLeaderForTable(tableNameWithType)) { resetWatermarkMs(tableNameWithType); } } ``` Since _mergeRollupWatermarks is a HashMap, looping over _mergeRollupWatermarks.keySet() will not iterating duplicate keys, so the `!candidateMergeTables.contains(tableNameWithType)` check is not needed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org