Skip to content

Fix stop race in MonitorScheduler. #19161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gianm merged 1 commit into from
Mar 16, 2026
Merged

Fix stop race in MonitorScheduler. #19161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion processing/src/main/java/org/apache/druid/java/util/metrics/AbstractMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public boolean isStarted()
}

@Override
public boolean monitor(ServiceEmitter emitter)
public synchronized boolean monitor(ServiceEmitter emitter)
{
if (started) {
return doMonitor(emitter);
Expand Down
65 changes: 0 additions & 65 deletions processing/src/main/java/org/apache/druid/java/util/metrics/CompoundMonitor.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion processing/src/main/java/org/apache/druid/java/util/metrics/Monitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public interface Monitor
void stop();

/**
* Emit metrics using the given emitter.
* Emit metrics using the given emitter. May be called from two separate threads: the scheduling thread and
* a lifecycle thread that is shutting down monitors. Therefore, this method must be thread-safe.
*
* @return true if this monitor needs to continue monitoring. False otherwise.
*/
Expand Down
Loading