Skip to content
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

Wrap enrich execute action in new tracing context #89021

Merged
merged 1 commit into from
Aug 2, 2022
Merged

Wrap enrich execute action in new tracing context #89021

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
104 changes: 56 additions & 48 deletions ...rich/src/main/java/org/elasticsearch/xpack/enrich/action/InternalExecutePolicyAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,56 +88,64 @@ protected void doExecute(Task transportTask, Request request, ActionListener<Res
return;
}

// Can't use provided task, because in the case wait_for_completion=false then
// as soon as actionListener#onResponse is invoked then the provided task get unregistered and
// then there no way to see the policy execution in the list tasks or get task APIs.
var task = (ExecuteEnrichPolicyTask) taskManager.register("enrich", TASK_ACTION, new TaskAwareRequest() {

@Override
public void setParentTask(TaskId taskId) {
request.setParentTask(taskId);
}

@Override
public TaskId getParentTask() {
return request.getParentTask();
}

@Override
public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
String description = "executing enrich policy [" + request.getName() + "]";
return new ExecuteEnrichPolicyTask(id, type, action, description, parentTaskId, headers);
}
});

try {
ActionListener<ExecuteEnrichPolicyStatus> listener;
if (request.isWaitForCompletion()) {
listener = ActionListener.wrap(result -> actionListener.onResponse(new Response(result)), actionListener::onFailure);
} else {
listener = ActionListener.wrap(result -> LOGGER.debug("successfully executed policy [{}]", request.getName()), e -> {
if (e instanceof TaskCancelledException) {
LOGGER.info(e.getMessage());
} else {
LOGGER.error("failed to execute policy [" + request.getName() + "]", e);
}
});
}
policyExecutor.runPolicyLocally(task, request.getName(), ActionListener.wrap(result -> {
try (var ignored = transportService.getThreadPool().getThreadContext().newTraceContext()) {
// Can't use provided task, because in the case wait_for_completion=false then
// as soon as actionListener#onResponse is invoked then the provided task get unregistered and
// then there no way to see the policy execution in the list tasks or get task APIs.
var task = (ExecuteEnrichPolicyTask) taskManager.register("enrich", TASK_ACTION, new TaskAwareRequest() {

@Override
public void setParentTask(TaskId taskId) {
request.setParentTask(taskId);
}

@Override
public TaskId getParentTask() {
return request.getParentTask();
}

@Override
public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
String description = "executing enrich policy [" + request.getName() + "]";
return new ExecuteEnrichPolicyTask(id, type, action, description, parentTaskId, headers);
}
});

try {
ActionListener<ExecuteEnrichPolicyStatus> listener;
if (request.isWaitForCompletion()) {
listener = ActionListener.wrap(
result -> actionListener.onResponse(new Response(result)),
actionListener::onFailure
);
} else {
listener = ActionListener.wrap(
result -> LOGGER.debug("successfully executed policy [{}]", request.getName()),
e -> {
if (e instanceof TaskCancelledException) {
LOGGER.info(e.getMessage());
} else {
LOGGER.error("failed to execute policy [" + request.getName() + "]", e);
}
}
);
}
policyExecutor.runPolicyLocally(task, request.getName(), ActionListener.wrap(result -> {
taskManager.unregister(task);
listener.onResponse(result);
}, e -> {
taskManager.unregister(task);
listener.onFailure(e);
}));

if (request.isWaitForCompletion() == false) {
TaskId taskId = new TaskId(clusterState.nodes().getLocalNodeId(), task.getId());
actionListener.onResponse(new Response(taskId));
}
} catch (Exception e) {
taskManager.unregister(task);
listener.onResponse(result);
}, e -> {
taskManager.unregister(task);
listener.onFailure(e);
}));

if (request.isWaitForCompletion() == false) {
TaskId taskId = new TaskId(clusterState.nodes().getLocalNodeId(), task.getId());
actionListener.onResponse(new Response(taskId));
throw e;
}
} catch (Exception e) {
taskManager.unregister(task);
throw e;
}
}

Expand Down