Skip to content

supervisor: Emit active/publishing task counts #17268

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

Closed
ac9817 wants to merge 4 commits into from
Closed

supervisor: Emit active/publishing task counts #17268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6bd5d8
superviosr: Emit active/publishing task counts
Oct 7, 2024
e5d33af
update tests
Oct 7, 2024
38ea363
coverage
Oct 7, 2024
84e2f10
changes
Oct 8, 2024
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
10 changes: 10 additions & 0 deletions indexing-service/src/main/java/org/apache/druid/indexing/common/task/Task.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,4 +343,14 @@ default BroadcastDatasourceLoadingSpec getBroadcastDatasourceLoadingSpec()
{
return BroadcastDatasourceLoadingSpec.createFromContext(getContext(), BroadcastDatasourceLoadingSpec.ALL);
}

/**
* specifies the current status of the task.
*
* @return string
*/
default String status()
{
return "UNKONWN";
}
}
7 changes: 7 additions & 0 deletions ...rvice/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,4 +311,11 @@ public Appenderator getAppenderator()
{
return runnerSupplier.get();
}

@Override
@VisibleForTesting
public String status()
{
return getRunner().getStatus().name();
}
}
1 change: 0 additions & 1 deletion ...rg/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2492,7 +2492,6 @@ public void testScheduleReporting()
{
EasyMock.expect(spec.isSuspended()).andReturn(false).anyTimes();
DruidMonitorSchedulerConfig config = new DruidMonitorSchedulerConfig();
EasyMock.expect(spec.getMonitorSchedulerConfig()).andReturn(config).times(2);
ScheduledExecutorService executorService = EasyMock.createMock(ScheduledExecutorService.class);
EasyMock.expect(executorService.scheduleWithFixedDelay(EasyMock.anyObject(), EasyMock.eq(86415000L), EasyMock.eq(300000L), EasyMock.eq(TimeUnit.MILLISECONDS))).andReturn(EasyMock.createMock(ScheduledFuture.class)).once();
EasyMock.expect(executorService.scheduleAtFixedRate(EasyMock.anyObject(), EasyMock.eq(86425000L), EasyMock.eq(config.getEmissionDuration().getMillis()), EasyMock.eq(TimeUnit.MILLISECONDS))).andReturn(EasyMock.createMock(ScheduledFuture.class)).times(2);
Expand Down
22 changes: 11 additions & 11 deletions services/src/main/java/org/apache/druid/cli/CliPeon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
import com.github.rvesse.airline.annotations.Option;
import com.github.rvesse.airline.annotations.restrictions.Required;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Binder;
import com.google.inject.Inject;
Expand Down Expand Up @@ -141,6 +139,7 @@
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
Expand Down Expand Up @@ -303,19 +302,20 @@ public void configure(Binder binder)
@Named(ServiceStatusMonitor.HEARTBEAT_TAGS_BINDING)
public Supplier<Map<String, Object>> heartbeatDimensions(Task task)
{
ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
builder.put(DruidMetrics.TASK_ID, task.getId());
builder.put(DruidMetrics.DATASOURCE, task.getDataSource());
builder.put(DruidMetrics.TASK_TYPE, task.getType());
builder.put(DruidMetrics.GROUP_ID, task.getGroupId());
Map<String, Object> map = new HashMap<>();
map.put(DruidMetrics.TASK_ID, task.getId());
map.put(DruidMetrics.DATASOURCE, task.getDataSource());
map.put(DruidMetrics.TASK_TYPE, task.getType());
map.put(DruidMetrics.GROUP_ID, task.getGroupId());
Map<String, Object> tags = task.getContextValue(DruidMetrics.TAGS);
if (tags != null && !tags.isEmpty()) {
builder.put(DruidMetrics.TAGS, tags);
map.put(DruidMetrics.TAGS, tags);
}

return Suppliers.ofInstance(
builder.build()
);
return () -> {
map.put(DruidMetrics.STATUS, task.status());
return map;
};
}

@Provides
Expand Down