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

Jump to bottom

fix(partition-plan): task's status is not as expected when error strategy is set to 'ignore any errors' #3805

Merged
merged 1 commit into from
Nov 8, 2024
Merged

fix(partition-plan): task's status is not as expected when error strategy is set to 'ignore any errors' #3805

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 client
Open in desktop
Submodule client updated 20 files
+11,985 −9,894 pnpm-lock.yaml
+32 −1 src/common/network/task.ts
+2 −2 src/component/Action/Item.tsx
+1 −1 src/component/EditorToolBar/actions/sql.tsx
+87 −13 src/component/Task/AlterDdlTask/CreateModal/index.tsx
+5 −1 src/component/Task/DetailModal.tsx
+32 −6 src/component/Task/component/ActionBar/index.tsx
+4 −4 src/component/Task/component/CommonDetailModal/LogModal.tsx
+115 −0 src/component/Task/component/CommonDetailModal/TaskProgress/ProgressDetailsModal.tsx
+51 −12 src/component/Task/component/CommonDetailModal/TaskProgress/colums.tsx
+27 −6 src/component/Task/component/CommonDetailModal/TaskProgress/index.tsx
+14 −3 src/component/Task/component/CommonDetailModal/index.tsx
+22 −8 src/component/Task/component/Status/index.tsx
+0 −38 src/component/Task/component/ThrottleFormItem/index.tsx
+21 −2 src/d.ts/index.ts
+3 −1 src/page/Gateway/newCloudConnection.ts
+5 −1 src/page/Workspace/ActivityBar/Logo.tsx
+1 −1 src/page/Workspace/components/SQLResultSet/index.tsx
+7 −0 src/store/sessionManager/session.ts
+3 −1 src/store/sessionManager/type.ts
10 changes: 6 additions & 4 deletions .../src/main/java/com/oceanbase/odc/service/flow/task/DatabaseChangeRuntimeFlowableTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ protected DatabaseChangeResult start(Long taskId, TaskService taskService, Deleg
DatabaseChangeResult result;
try {
log.info("Async task starts, taskId={}, activityId={}", taskId, execution.getCurrentActivityId());
asyncTaskThread = generateOdcAsyncTaskThread(taskId, execution);
DatabaseChangeParameters parameters = FlowTaskUtil.getAsyncParameter(execution);
asyncTaskThread = generateOdcAsyncTaskThread(taskId, parameters, execution);
taskService.start(taskId);
TaskEntity taskEntity = taskService.detail(taskId);
result = JsonUtils.fromJson(taskEntity.getResultJson(), DatabaseChangeResult.class);
Expand All @@ -120,7 +121,8 @@ protected DatabaseChangeResult start(Long taskId, TaskService taskService, Deleg
result = asyncTaskThread.getResult();
result.setRollbackPlanResult(rollbackPlanTaskResult);
result.setAutoModifyTimeout(this.autoModifyTimeout);
if (asyncTaskThread.isAbort()) {
if (asyncTaskThread.isAbort()
|| (result.getFailCount() > 0 && parameters.isMarkAsFailedWhenAnyErrorsHappened())) {
isFailure = true;
taskService.fail(taskId, asyncTaskThread.getProgressPercentage(), result);
} else if (asyncTaskThread.getStop()) {
Expand Down Expand Up @@ -186,9 +188,9 @@ protected void onProgressUpdate(Long taskId, TaskService taskService) {
}
}

private DatabaseChangeThread generateOdcAsyncTaskThread(Long taskId, DelegateExecution execution) {
private DatabaseChangeThread generateOdcAsyncTaskThread(Long taskId,
DatabaseChangeParameters parameters, DelegateExecution execution) {
Long creatorId = FlowTaskUtil.getTaskCreator(execution).getId();
DatabaseChangeParameters parameters = FlowTaskUtil.getAsyncParameter(execution);
ConnectionConfig connectionConfig = FlowTaskUtil.getConnectionConfig(execution);
modifyTimeoutIfTimeConsumingSqlExists(execution, parameters, connectionConfig.getDialectType(), creatorId);
connectionConfig.setQueryTimeoutSeconds((int) TimeUnit.MILLISECONDS.toSeconds(parameters.getTimeoutMillis()));
Expand Down
1 change: 1 addition & 0 deletions ...ice/src/main/java/com/oceanbase/odc/service/flow/task/model/DatabaseChangeParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class DatabaseChangeParameters implements Serializable, TaskParameters {
private List<String> rollbackSqlObjectIds;
private Long timeoutMillis = 172800000L;// 2d for default
private TaskErrorStrategy errorStrategy;
private boolean markAsFailedWhenAnyErrorsHappened;
private String delimiter = ";";
private Integer queryLimit = 1000;
private Integer riskLevelIndex;
Expand Down
1 change: 1 addition & 0 deletions ...er/odc-service/src/main/java/com/oceanbase/odc/service/schedule/job/PartitionPlanJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ private void submitSubDatabaseChangeTask(Long parentFlowInstanceId, Long databas
return;
}
DatabaseChangeParameters taskParameters = new DatabaseChangeParameters();
taskParameters.setMarkAsFailedWhenAnyErrorsHappened(true);
taskParameters.setModifyTimeoutIfTimeConsumingSqlExists(false);
taskParameters.setErrorStrategy(errorStrategy.name());
StringBuilder sqlContent = new StringBuilder();
Expand Down