You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by "jtuglu1 (via GitHub)" <gi...@apache.org> on 2026/05/11 18:31:44 UTC
[PR] feat: separate worker disabled state from worker version (druid)
jtuglu1 opened a new pull request, #19448:
URL: https://github.com/apache/druid/pull/19448
<!-- Replace XXXX with the id of the issue fixed in this PR. Remove this section if there is no corresponding issue. Don't reference the issue in the title of this pull-request. -->
<!-- If you are a committer, follow the PR action item checklist for committers:
https://github.com/apache/druid/blob/master/dev/committer-instructions.md#pr-and-issue-action-item-checklist-for-committers. -->
### Description
Currently, to disable a worker (MM/Indexer), you need to set the version as `""`. This is less than ideal, as it's difficult to see a) what version a disabled worker is and b) write any logic to perform scaling around multi-version worker deployments (for example during a rolling upgrade).
This ensures the disabled state is tracked separately from the worker version.
<!--
In each section, please describe design decisions made, including:
- Choice of algorithms
- Behavioral aspects. What configuration values are acceptable? How are corner cases and error conditions handled, such as when there are insufficient resources?
- Class organization and design (how the logic is split between classes, inheritance, composition, design patterns)
- Method organization and design (how the logic is split between methods, parameters and return types)
- Naming (class, method, API, configuration, HTTP endpoint, names of emitted metrics)
-->
<!-- It's good to describe an alternative design (or mention an alternative name) for every design (or naming) decision point and compare the alternatives with the designs that you've implemented (or the names you've chosen) to highlight the advantages of the chosen designs and names. -->
<!-- If there was a discussion of the design of the feature implemented in this PR elsewhere (e. g. a "Proposal" issue, any other issue, or a thread in the development mailing list), link to that discussion from this PR description and explain what have changed in your final design compared to your original proposal or the consensus version in the end of the discussion. If something hasn't changed since the original discussion, you can omit a detailed discussion of those aspects of the design here, perhaps apart from brief mentioning for the sake of readability of this PR description. -->
<!-- Some of the aspects mentioned above may be omitted for simple and small changes. -->
#### Release note
<!-- Give your best effort to summarize your changes in a couple of sentences aimed toward Druid users.
If your change doesn't have end user impact, you can skip this section.
For tips about how to write a good release note, see [Release notes](https://github.com/apache/druid/blob/master/CONTRIBUTING.md#release-notes).
-->
<hr>
##### Key changed/added classes in this PR
* `MyFoo`
* `OurBar`
* `TheirBaz`
<hr>
<!-- Check the items by putting "x" in the brackets for the done things. Not all of these items apply to every PR. Remove the items which are not done or not relevant to the PR. None of the items from the checklist below are strictly necessary, but it would be very helpful if you at least self-review the PR. -->
This PR has:
- [ ] been self-reviewed.
- [ ] using the [concurrency checklist](https://github.com/apache/druid/blob/master/dev/code-review/concurrency.md) (Remove this item if the PR doesn't have any relation to concurrency.)
- [ ] added documentation for new or modified features or behaviors.
- [ ] a release note entry in the PR description.
- [ ] added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
- [ ] added or updated version, license, or notice information in [licenses.yaml](https://github.com/apache/druid/blob/master/dev/license.md)
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
- [ ] added unit tests or modified existing tests to cover new code paths, ensuring the threshold for [code coverage](https://github.com/apache/druid/blob/master/dev/code-review/code-coverage.md) is met.
- [ ] added integration tests.
- [ ] been tested in a test Druid cluster.
--
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-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] feat: separate worker disabled state from worker version (druid)
Posted by "jtuglu1 (via GitHub)" <gi...@apache.org>.
jtuglu1 merged PR #19448:
URL: https://github.com/apache/druid/pull/19448
--
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-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] feat: separate worker disabled state from worker version (druid)
Posted by "FrankChen021 (via GitHub)" <gi...@apache.org>.
FrankChen021 commented on code in PR #19448:
URL: https://github.com/apache/druid/pull/19448#discussion_r3234372687
##########
indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java:
##########
@@ -444,21 +433,29 @@ private void notifyListener(List<TaskAnnouncement> announcements, boolean isWork
ex,
"Unknown exception while updating task[%s] state from worker[%s].",
announcement.getTaskId(),
- worker.getHost()
+ enabledWorker.getHost()
);
}
}
syncedAtleastOnce.set(true);
if (isWorkerDisabled != disabled.get()) {
disabled.set(isWorkerDisabled);
- log.info("Worker[%s] disabled set to [%s].", worker.getHost(), isWorkerDisabled);
+ log.info("Worker[%s] disabled set to [%s].", enabledWorker.getHost(), isWorkerDisabled);
listener.stateChanged(!isWorkerDisabled, WorkerHolder.this);
}
}
};
}
+ private static Worker workerWithDisabledState(Worker w, boolean disabled)
+ {
+ if (w.isDisabled() == disabled) {
+ return w;
+ }
+ return new Worker(w.getScheme(), w.getHost(), w.getIp(), w.getCapacity(), w.getVersion(), w.getCategory(), disabled);
Review Comment:
[P2] Update console disabled checks for preserved worker versions
This now builds the disabled HRTR Worker with its real version instead of the legacy empty string, so `/druid/indexer/v1/workers` can serialize disabled workers as `{ disabled: true, version: "v1" }`. The web console still checks `worker.version === ''` in `services-view.tsx` for both the Disabled label and Enable/Disable action selection, so HRTR-disabled workers will appear enabled and the UI will offer Disable instead of Enable. Update the console WorkerInfo type and checks to use `worker.disabled`, with `version === ''` retained as a legacy fallback.
--
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-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] feat: separate worker disabled state from worker version (druid)
Posted by "abhishekrb19 (via GitHub)" <gi...@apache.org>.
abhishekrb19 commented on code in PR #19448:
URL: https://github.com/apache/druid/pull/19448#discussion_r3229000137
##########
indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java:
##########
@@ -65,8 +65,9 @@ public class WorkerHolder
public static final TypeReference<ChangeRequestsSnapshot<WorkerHistoryItem>> WORKER_SYNC_RESP_TYPE_REF = new TypeReference<>() {};
- private final Worker worker;
- private Worker disabledWorker;
+ // Pre-built views with isDisabled() set to false/true respectively. getWorker() selects between them based on `disabled`.
Review Comment:
nit: make this a javadoc instead
```suggestion
/**
*Pre-built views with isDisabled() set to false/true respectively. {@link #getWorker()} selects between them based on {@link #disabled}.
*/
```
##########
indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java:
##########
@@ -145,23 +147,8 @@ public void setBlacklistedUntil(DateTime blacklistedUntil)
public ImmutableWorkerInfo toImmutable()
{
- Worker w = worker;
- if (disabled.get()) {
- if (disabledWorker == null) {
- disabledWorker = new Worker(
- worker.getScheme(),
- worker.getHost(),
- worker.getIp(),
- worker.getCapacity(),
- "",
Review Comment:
This is where version was set to "" previously, not sure why `worker.getVersion()` wasn't propagated all the way through in the first place
##########
indexing-service/src/main/java/org/apache/druid/indexing/overlord/ZkWorker.java:
##########
@@ -205,7 +205,8 @@ public boolean isRunningTask(String taskId)
@UsedInGeneratedCode // See JavaScriptWorkerSelectStrategyTest
public boolean isValidVersion(String minVersion)
{
- return worker.get().getVersion().compareTo(minVersion) >= 0;
+ var w = worker.get();
Review Comment:
Are `var`s used now with the target JDK bumped? It seems like some tests do but non-test main code still use strongly typed variables. So I think it'd probably be best to align with that code style for now.
--
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-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
Re: [PR] feat: separate worker disabled state from worker version (druid)
Posted by "jtuglu1 (via GitHub)" <gi...@apache.org>.
jtuglu1 commented on code in PR #19448:
URL: https://github.com/apache/druid/pull/19448#discussion_r3229136075
##########
indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java:
##########
@@ -145,23 +147,8 @@ public void setBlacklistedUntil(DateTime blacklistedUntil)
public ImmutableWorkerInfo toImmutable()
{
- Worker w = worker;
- if (disabled.get()) {
- if (disabledWorker == null) {
- disabledWorker = new Worker(
- worker.getScheme(),
- worker.getHost(),
- worker.getIp(),
- worker.getCapacity(),
- "",
Review Comment:
Yeah – the `""` is meant to be disabled worker version where the worker is initialized as disabled.
--
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-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org