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 f45f1aecd8d Increase scope to allow access for extended classes
(#17343)
f45f1aecd8d is described below
commit f45f1aecd8dcca2823b6dad3d968d03704b1c87c
Author: Shounak kulkarni <[email protected]>
AuthorDate: Tue Dec 16 03:12:58 2025 +0530
Increase scope to allow access for extended classes (#17343)
---
.../core/minion/PinotHelixTaskResourceManager.java | 4 +--
.../helix/core/minion/PinotTaskManager.java | 42 +++++++++++-----------
.../core/minion/generator/TaskGeneratorUtils.java | 2 +-
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
index 2edb74b0213..2da272c1c1b 100644
---
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
+++
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/PinotHelixTaskResourceManager.java
@@ -1289,7 +1289,7 @@ public class PinotHelixTaskResourceManager {
* @param helixJobName Helix Job name
* @return Pinot task name
*/
- private static String getPinotTaskName(String helixJobName) {
+ public static String getPinotTaskName(String helixJobName) {
return helixJobName.substring(TASK_QUEUE_PREFIX.length() +
getTaskType(helixJobName).length() + 1);
}
@@ -1302,7 +1302,7 @@ public class PinotHelixTaskResourceManager {
* @param name Pinot task name, Helix JobQueue name or Helix Job name
* @return Task type
*/
- private static String getTaskType(String name) {
+ public static String getTaskType(String name) {
String[] parts = name.split(TASK_NAME_SEPARATOR);
if (parts.length < 2) {
throw new IllegalArgumentException(String.format("Invalid task name :
%s. Missing separator %s",
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 d7b7eaf8868..f93e28ba0d7 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
@@ -96,31 +96,31 @@ public class PinotTaskManager extends
ControllerPeriodicTask<Void> {
public final static String SCHEDULE_KEY = "schedule";
public final static String MINION_INSTANCE_TAG_CONFIG = "minionInstanceTag";
- private static final String TABLE_CONFIG_PARENT_PATH = "/CONFIGS/TABLE";
- private static final String TABLE_CONFIG_PATH_PREFIX = "/CONFIGS/TABLE/";
- private static final String TASK_QUEUE_PATH_PATTERN =
"/TaskRebalancer/TaskQueue_%s/Context";
+ protected static final String TABLE_CONFIG_PARENT_PATH = "/CONFIGS/TABLE";
+ protected static final String TABLE_CONFIG_PATH_PREFIX = "/CONFIGS/TABLE/";
+ protected static final String TASK_QUEUE_PATH_PATTERN =
"/TaskRebalancer/TaskQueue_%s/Context";
- private final PinotHelixTaskResourceManager _helixTaskResourceManager;
- private final ClusterInfoAccessor _clusterInfoAccessor;
- private final TaskGeneratorRegistry _taskGeneratorRegistry;
- private final ResourceUtilizationManager _resourceUtilizationManager;
+ protected final PinotHelixTaskResourceManager _helixTaskResourceManager;
+ protected final ClusterInfoAccessor _clusterInfoAccessor;
+ protected final TaskGeneratorRegistry _taskGeneratorRegistry;
+ protected final ResourceUtilizationManager _resourceUtilizationManager;
// For cron-based scheduling
- private final Scheduler _scheduler;
- private final boolean _skipLateCronSchedule;
- private final int _maxCronScheduleDelayInSeconds;
- private final Map<String, Map<String, String>>
_tableTaskTypeToCronExpressionMap = new ConcurrentHashMap<>();
- private final Map<String, TableTaskSchedulerUpdater>
_tableTaskSchedulerUpdaterMap = new ConcurrentHashMap<>();
+ protected final Scheduler _scheduler;
+ protected final boolean _skipLateCronSchedule;
+ protected final int _maxCronScheduleDelayInSeconds;
+ protected final Map<String, Map<String, String>>
_tableTaskTypeToCronExpressionMap = new ConcurrentHashMap<>();
+ protected final Map<String, TableTaskSchedulerUpdater>
_tableTaskSchedulerUpdaterMap = new ConcurrentHashMap<>();
- private final boolean _isPinotTaskManagerSchedulerEnabled;
+ protected final boolean _isPinotTaskManagerSchedulerEnabled;
// For metrics
- private final Map<String, TaskTypeMetricsUpdater> _taskTypeMetricsUpdaterMap
= new ConcurrentHashMap<>();
- private final Map<TaskState, Integer> _taskStateToCountMap = new
ConcurrentHashMap<>();
+ protected final Map<String, TaskTypeMetricsUpdater>
_taskTypeMetricsUpdaterMap = new ConcurrentHashMap<>();
+ protected final Map<TaskState, Integer> _taskStateToCountMap = new
ConcurrentHashMap<>();
- private final ZkTableConfigChangeListener _zkTableConfigChangeListener = new
ZkTableConfigChangeListener();
+ protected final ZkTableConfigChangeListener _zkTableConfigChangeListener =
new ZkTableConfigChangeListener();
- private final TaskManagerStatusCache<TaskGeneratorMostRecentRunInfo>
_taskManagerStatusCache;
+ protected final TaskManagerStatusCache<TaskGeneratorMostRecentRunInfo>
_taskManagerStatusCache;
protected final @Nullable DistributedTaskLockManager
_distributedTaskLockManager;
@@ -325,7 +325,7 @@ public class PinotTaskManager extends
ControllerPeriodicTask<Void> {
_distributedTaskLockManager.forceReleaseLock(tableNameWithType);
}
- private class ZkTableConfigChangeListener implements IZkChildListener {
+ protected class ZkTableConfigChangeListener implements IZkChildListener {
@Override
public synchronized void handleChildChange(String path, List<String>
tableNamesWithType) {
@@ -333,7 +333,7 @@ public class PinotTaskManager extends
ControllerPeriodicTask<Void> {
}
}
- private void checkTableConfigChanges(List<String> tableNamesWithType) {
+ protected void checkTableConfigChanges(List<String> tableNamesWithType) {
LOGGER.info("Checking task config changes in table configs");
// NOTE: we avoided calling _leadControllerManager::isLeaderForTable here
to skip tables the current
// controller is not leader for. Because _leadControllerManager updates
its leadership states based
@@ -364,11 +364,11 @@ public class PinotTaskManager extends
ControllerPeriodicTask<Void> {
}
}
- private String getPropertyStorePathForTable(String tableWithType) {
+ protected String getPropertyStorePathForTable(String tableWithType) {
return TABLE_CONFIG_PATH_PREFIX + tableWithType;
}
- private String getPropertyStorePathForTaskQueue(String taskType) {
+ protected String getPropertyStorePathForTaskQueue(String taskType) {
return String.format(TASK_QUEUE_PATH_PATTERN, taskType);
}
diff --git
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorUtils.java
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorUtils.java
index ec5d393f473..01006f9eb7c 100644
---
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorUtils.java
+++
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/minion/generator/TaskGeneratorUtils.java
@@ -48,7 +48,7 @@ public class TaskGeneratorUtils {
* STOPPED is not a final task state in helix task framework, as a stopped
task
* is just paused and can be resumed to rerun.
*/
- private static final EnumSet<TaskState> TASK_FINAL_STATES =
+ public static final EnumSet<TaskState> TASK_FINAL_STATES =
EnumSet.of(TaskState.COMPLETED, TaskState.FAILED, TaskState.ABORTED,
TaskState.TIMED_OUT);
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
