This is an automated email from the ASF dual-hosted git repository.
jlli pushed a commit to branch include-task-interface-change
in repository https://gitbox.apache.org/repos/asf/pinot.git
commit 94e95b8025fe2b01816bac9e73ca833f213e9539
Author: Jialiang Li <j...@linkedin.com>
AuthorDate: Tue Jul 9 14:19:07 2024 -0700
Add nonLeaderCleanUp with tables parameters in PinotTaskGenerator (#13509)
---
.../controller/helix/core/minion/PinotTaskManager.java | 15 ++++++++++++++-
.../helix/core/minion/generator/PinotTaskGenerator.java | 7 +++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
index 621e82547f..bd85a1ef0f 100644
---
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
+++
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotTaskManager.java
@@ -33,7 +33,8 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import javax.annotation.Nullable;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.helix.AccessOption;
import org.apache.helix.task.TaskState;
import org.apache.helix.zookeeper.zkclient.IZkChildListener;
@@ -702,6 +703,18 @@ public class PinotTaskManager extends
ControllerPeriodicTask<Void> {
}
}
+ @Override
+ protected void nonLeaderCleanup(List<String> tableNamesWithType) {
+ LOGGER.info(
+ "Cleaning up all task generators for tables that the controller is not
the leader for. Number of tables to be"
+ + " cleaned up: {}. Printing at most first 10 table names to be
cleaned up: [{}].",
+ tableNamesWithType.size(),
+ StringUtils.join(tableNamesWithType.stream().limit(10).map(t -> "\"" +
t + "\"").toArray(), ", "));
+ for (String taskType : _taskGeneratorRegistry.getAllTaskTypes()) {
+
_taskGeneratorRegistry.getTaskGenerator(taskType).nonLeaderCleanUp(tableNamesWithType);
+ }
+ }
+
@Nullable
public Scheduler getScheduler() {
return _scheduler;
diff --git
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java
index ad42135886..fd2a4615ed 100644
---
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java
+++
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/PinotTaskGenerator.java
@@ -86,6 +86,13 @@ public interface PinotTaskGenerator {
default void nonLeaderCleanUp() {
}
+ /**
+ * Performs necessary cleanups (e.g. remove metrics) when the controller
leadership changes,
+ * given a list of tables that the current controller isn't the leader for.
+ */
+ default void nonLeaderCleanUp(List<String> tableNamesWithType) {
+ }
+
/**
* Gets the minionInstanceTag for the tableConfig
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
