Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Commit

Permalink
fix update with large payload task result
Browse files Browse the repository at this point in the history
  • Loading branch information
@apanicker-nflx
apanicker-nflx committed May 10, 2022
1 parent f5bc54f commit 95bb8e4
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 57 deletions.
27 changes: 17 additions & 10 deletions client/src/main/java/com/netflix/conductor/client/automator/TaskPollExecutor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,18 +279,16 @@ private void updateTaskResult(int count, Task task, TaskResult result, Worker wo
try {
TaskResult finalResult =
retryOperation(
(TaskResult taskResult) -> {
taskClient.evaluateAndUploadLargePayload(
taskResult, task.getTaskType());
return null;
},
(TaskResult taskResult) ->
taskClient.evaluateAndUploadLargePayload(
taskResult.getOutputData(), task.getTaskType()),
count,
result);

retryOperation(
(TaskResult taskResult) -> {
taskClient.updateTask(taskResult);
return null;
return Optional.empty();
},
count,
finalResult);
Expand All @@ -306,13 +304,22 @@ private void updateTaskResult(int count, Task task, TaskResult result, Worker wo
}

private TaskResult retryOperation(
Function<TaskResult, Void> operation, int count, TaskResult result) {
Function<TaskResult, Optional<String>> operation, int count, TaskResult result) {
int index = 0;
while (index < count) {
try {
TaskResult taskResult = result.copy();
operation.apply(taskResult);
return taskResult;
Optional<String> optionalExternalStorageLocation = operation.apply(result);
if (optionalExternalStorageLocation.isPresent()) {
result.setExternalOutputPayloadStoragePath(
optionalExternalStorageLocation.get());
result.setOutputData(null);
}
return result;
} catch (IllegalArgumentException iae) {
result.setReasonForIncompletion(iae.getMessage());
result.setOutputData(null);
result.setStatus(TaskResult.Status.FAILED_WITH_TERMINAL_ERROR);
return result;
} catch (Exception e) {
index++;
try {
Expand Down
38 changes: 13 additions & 25 deletions client/src/main/java/com/netflix/conductor/client/http/TaskClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,10 @@ public void updateTask(TaskResult taskResult) {
postForEntityWithRequestOnly("tasks", taskResult);
}

public void evaluateAndUploadLargePayload(TaskResult taskResult, String taskType) {
Preconditions.checkNotNull(taskResult, "Task result cannot be null");
Preconditions.checkArgument(
StringUtils.isBlank(taskResult.getExternalOutputPayloadStoragePath()),
"External Storage Path must not be set");

public Optional<String> evaluateAndUploadLargePayload(
Map<String, Object> taskOutputData, String taskType) {
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
objectMapper.writeValue(byteArrayOutputStream, taskResult.getOutputData());
objectMapper.writeValue(byteArrayOutputStream, taskOutputData);
byte[] taskOutputBytes = byteArrayOutputStream.toByteArray();
long taskResultSize = taskOutputBytes.length;
MetricsContainer.recordTaskResultPayloadSize(taskType, taskResultSize);
Expand All @@ -257,30 +253,22 @@ public void evaluateAndUploadLargePayload(TaskResult taskResult, String taskType
|| taskResultSize
> conductorClientConfiguration.getTaskOutputMaxPayloadThresholdKB()
* 1024L) {
taskResult.setReasonForIncompletion(
throw new IllegalArgumentException(
String.format(
"The TaskResult payload size: %d is greater than the permissible %d bytes",
taskResultSize, payloadSizeThreshold));
taskResult.setStatus(TaskResult.Status.FAILED_WITH_TERMINAL_ERROR);
taskResult.setOutputData(null);
} else {
MetricsContainer.incrementExternalPayloadUsedCount(
taskType,
ExternalPayloadStorage.Operation.WRITE.name(),
ExternalPayloadStorage.PayloadType.TASK_OUTPUT.name());
String externalStoragePath =
uploadToExternalPayloadStorage(
ExternalPayloadStorage.PayloadType.TASK_OUTPUT,
taskOutputBytes,
taskResultSize);
taskResult.setExternalOutputPayloadStoragePath(externalStoragePath);
taskResult.setOutputData(null);
}
MetricsContainer.incrementExternalPayloadUsedCount(
taskType,
ExternalPayloadStorage.Operation.WRITE.name(),
ExternalPayloadStorage.PayloadType.TASK_OUTPUT.name());
return Optional.of(
uploadToExternalPayloadStorage(
PayloadType.TASK_OUTPUT, taskOutputBytes, taskResultSize));
}
return Optional.empty();
} catch (IOException e) {
String errorMsg =
String.format(
"Unable to update task: %s with task result", taskResult.getTaskId());
String errorMsg = String.format("Unable to update task: %s with task result", taskType);
LOGGER.error(errorMsg, e);
throw new ConductorClientException(errorMsg, e);
}
Expand Down
48 changes: 47 additions & 1 deletion client/src/test/java/com/netflix/conductor/client/automator/TaskPollExecutorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.*;

Expand Down Expand Up @@ -136,6 +137,7 @@ public TaskResult answer(InvocationOnMock invocation) {
verify(taskClient, times(3)).updateTask(any());
}

@SuppressWarnings("unchecked")
@Test
public void testLargePayloadCanFailUpdateWithRetry() throws InterruptedException {
Task task = testTask();
Expand All @@ -158,7 +160,7 @@ public void testLargePayloadCanFailUpdateWithRetry() throws InterruptedException
throw new ConductorClientException();
})
.when(taskClient)
.evaluateAndUploadLargePayload(any(TaskResult.class), any());
.evaluateAndUploadLargePayload(any(Map.class), any());

TaskPollExecutor taskPollExecutor =
new TaskPollExecutor(
Expand All @@ -181,6 +183,50 @@ public void testLargePayloadCanFailUpdateWithRetry() throws InterruptedException
verify(taskClient, times(0)).updateTask(any());
}

@Test
public void testLargePayloadLocationUpdate() throws InterruptedException {
Task task = testTask();
String largePayloadLocation = "large_payload_location";

Worker worker = mock(Worker.class);
when(worker.getPollingInterval()).thenReturn(3000);
when(worker.getTaskDefName()).thenReturn(TEST_TASK_DEF_NAME);
when(worker.execute(any())).thenReturn(new TaskResult(task));

TaskClient taskClient = Mockito.mock(TaskClient.class);
when(taskClient.pollTask(any(), any(), any())).thenReturn(task);
when(taskClient.ack(any(), any())).thenReturn(true);
//noinspection unchecked
when(taskClient.evaluateAndUploadLargePayload(any(Map.class), any()))
.thenReturn(Optional.of(largePayloadLocation));

TaskPollExecutor taskPollExecutor =
new TaskPollExecutor(
null, taskClient, 1, 3, new HashMap<>(), "test-worker-", new HashMap<>());
CountDownLatch latch = new CountDownLatch(1);

doAnswer(
invocation -> {
Object[] args = invocation.getArguments();
TaskResult result = (TaskResult) args[0];
assertNull(result.getOutputData());
assertEquals(
largePayloadLocation,
result.getExternalOutputPayloadStoragePath());
latch.countDown();
return null;
})
.when(taskClient)
.updateTask(any());

Executors.newSingleThreadScheduledExecutor()
.scheduleAtFixedRate(
() -> taskPollExecutor.pollAndExecute(worker), 0, 1, TimeUnit.SECONDS);
latch.await();

verify(taskClient, times(1)).updateTask(any());
}

@Test
public void testTaskPollException() throws InterruptedException {
Task task = testTask();
Expand Down
21 changes: 0 additions & 21 deletions common/src/main/java/com/netflix/conductor/common/metadata/tasks/TaskResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,25 +311,4 @@ public static TaskResult newTaskResult(Status status) {
result.setStatus(status);
return result;
}

/**
* Copy the given task result object
*
* @return a deep copy of the task result object except the externalOutputPayloadStoragePath
* field
*/
public TaskResult copy() {
TaskResult taskResult = new TaskResult();
taskResult.setWorkflowInstanceId(workflowInstanceId);
taskResult.setTaskId(taskId);
taskResult.setReasonForIncompletion(reasonForIncompletion);
taskResult.setCallbackAfterSeconds(callbackAfterSeconds);
taskResult.setWorkerId(workerId);
taskResult.setStatus(status);
taskResult.setOutputData(outputData);
taskResult.setOutputMessage(outputMessage);
taskResult.setLogs(logs);
taskResult.setSubWorkflowId(subWorkflowId);
return taskResult;
}
}

0 comments on commit 95bb8e4

Please sign in to comment.