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(dlm):data delete failure in periodic task and remove sys tenant verification #857

Merged
merged 11 commits into from
Nov 22, 2023
Merged

fix(dlm):data delete failure in periodic task and remove sys tenant verification #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ef696df
do not check sys tenant user.
guowl3 Nov 7, 2023
8920612
fix data delete failed after data archived.
guowl3 Nov 8, 2023
6febeec
Merge branch 'tianke_422bp_fix_data_delete_failed_' into tianke_422bp…
guowl3 Nov 8, 2023
2c87854
fix delete data failed.
guowl3 Nov 14, 2023
ff15e86
fix delete data failed.
guowl3 Nov 14, 2023
60f5df4
fix delete data failed.
guowl3 Nov 14, 2023
7563aaa
Merge branch 'dev/4.2.2' into tianke_422bp_feat_opt_sys_tenant
guowl3 Nov 15, 2023
de493c3
Merge branch 'dev/4.2.2' into tianke_422bp_feat_opt_sys_tenant
guowl3 Nov 21, 2023
5babeae
fix update limit config failed.
guowl3 Nov 21, 2023
7f60fe4
fix rollback failed.
guowl3 Nov 22, 2023
de6258b
upgrade dlm sdk to 106
guowl3 Nov 22, 2023
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<mina.version>2.1.6</mina.version>

<!-- data-lifecycle-manager version -->
<data-lifecycle-manager.version>1.0.4</data-lifecycle-manager.version>
<data-lifecycle-manager.version>1.0.6</data-lifecycle-manager.version>

<!-- plugin version -->
<formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
Expand Down
23 changes: 0 additions & 23 deletions server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/DlmEnvironment.java
View file
Open in desktop

This file was deleted.

46 changes: 27 additions & 19 deletions server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/ScheduleService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
import com.oceanbase.odc.service.schedule.model.ScheduleTaskMapper;
import com.oceanbase.odc.service.schedule.model.ScheduleTaskResp;
import com.oceanbase.odc.service.schedule.model.TriggerConfig;
import com.oceanbase.odc.service.schedule.model.TriggerStrategy;
import com.oceanbase.odc.service.task.model.ExecutorInfo;

import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -302,18 +303,21 @@ public ScheduleTaskResp dataArchiveDelete(Long scheduleId, Long taskId) {
throw new IllegalStateException("Delete is not allowed because the data archive job has not succeeded.");
}

// TODO throw
try {
if (!quartzJobService.checkExists(jobKey)) {
CreateQuartzJobReq req = new CreateQuartzJobReq();
req.setScheduleId(scheduleId);
req.setType(JobType.DATA_ARCHIVE_DELETE);
DataArchiveClearParameters parameters = new DataArchiveClearParameters();
parameters.setDataArchiveTaskId(taskId);
req.getJobDataMap().putAll(BeanMap.create(parameters));
quartzJobService.createJob(req);
if (quartzJobService.checkExists(jobKey)) {
log.info("Data archive delete job exists and start delete job,jobKey={}", jobKey);
quartzJobService.deleteJob(jobKey);
}
quartzJobService.triggerJob(jobKey);
CreateQuartzJobReq req = new CreateQuartzJobReq();
req.setScheduleId(scheduleId);
req.setType(JobType.DATA_ARCHIVE_DELETE);
DataArchiveClearParameters parameters = new DataArchiveClearParameters();
parameters.setDataArchiveTaskId(taskId);
TriggerConfig triggerConfig = new TriggerConfig();
triggerConfig.setTriggerStrategy(TriggerStrategy.START_NOW);
req.getJobDataMap().putAll(BeanMap.create(parameters));
req.setTriggerConfig(triggerConfig);
quartzJobService.createJob(req);
} catch (SchedulerException e) {
throw new RuntimeException(e);
}
Expand All @@ -337,16 +341,20 @@ public ScheduleTaskResp rollbackTask(Long scheduleId, Long taskId) {
}

try {
if (!quartzJobService.checkExists(jobKey)) {
CreateQuartzJobReq req = new CreateQuartzJobReq();
req.setScheduleId(scheduleId);
req.setType(JobType.DATA_ARCHIVE_ROLLBACK);
DataArchiveRollbackParameters parameters = new DataArchiveRollbackParameters();
parameters.setDataArchiveTaskId(taskId);
req.getJobDataMap().putAll(BeanMap.create(parameters));
quartzJobService.createJob(req);
if (quartzJobService.checkExists(jobKey)) {
log.info("Data archive rollback job exists and start delete job,jobKey={}", jobKey);
quartzJobService.deleteJob(jobKey);
}
quartzJobService.triggerJob(jobKey);
CreateQuartzJobReq req = new CreateQuartzJobReq();
req.setScheduleId(scheduleId);
req.setType(JobType.DATA_ARCHIVE_ROLLBACK);
DataArchiveRollbackParameters parameters = new DataArchiveRollbackParameters();
parameters.setDataArchiveTaskId(taskId);
req.getJobDataMap().putAll(BeanMap.create(parameters));
TriggerConfig triggerConfig = new TriggerConfig();
triggerConfig.setTriggerStrategy(TriggerStrategy.START_NOW);
req.setTriggerConfig(triggerConfig);
quartzJobService.createJob(req);
} catch (SchedulerException e) {
throw new RuntimeException(e);
}
Expand Down
9 changes: 0 additions & 9 deletions ...ce/src/main/java/com/oceanbase/odc/service/schedule/flowtask/DataArchivePreprocessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import com.oceanbase.odc.service.flow.processor.ScheduleTaskPreprocessor;
import com.oceanbase.odc.service.iam.auth.AuthenticationFacade;
import com.oceanbase.odc.service.plugin.ConnectionPluginUtil;
import com.oceanbase.odc.service.schedule.DlmEnvironment;
import com.oceanbase.odc.service.schedule.ScheduleService;
import com.oceanbase.odc.service.schedule.model.JobType;
import com.oceanbase.odc.service.session.factory.DefaultConnectSessionFactory;
Expand All @@ -49,10 +48,6 @@
@Slf4j
@ScheduleTaskPreprocessor(type = JobType.DATA_ARCHIVE)
public class DataArchivePreprocessor extends AbstractDlmJobPreprocessor {

@Autowired
private DlmEnvironment dlmEnvironment;

@Autowired
private AuthenticationFacade authenticationFacade;

Expand All @@ -75,10 +70,6 @@ public void process(CreateFlowInstanceReq req) {
// permission to access it.
Database sourceDb = databaseService.detail(dataArchiveParameters.getSourceDatabaseId());
Database targetDb = databaseService.detail(dataArchiveParameters.getTargetDataBaseId());
if (dlmEnvironment.isSysTenantUserRequired()) {
checkDatasource(sourceDb.getDataSource());
checkDatasource(targetDb.getDataSource());
}
dataArchiveParameters.setSourceDatabaseName(sourceDb.getName());
dataArchiveParameters.setTargetDatabaseName(targetDb.getName());
dataArchiveParameters.setSourceDataSourceName(sourceDb.getDataSource().getName());
Expand Down
9 changes: 1 addition & 8 deletions ...ice/src/main/java/com/oceanbase/odc/service/schedule/flowtask/DataDeletePreprocessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.oceanbase.odc.service.flow.model.CreateFlowInstanceReq;
import com.oceanbase.odc.service.flow.processor.ScheduleTaskPreprocessor;
import com.oceanbase.odc.service.iam.auth.AuthenticationFacade;
import com.oceanbase.odc.service.schedule.DlmEnvironment;
import com.oceanbase.odc.service.schedule.ScheduleService;
import com.oceanbase.odc.service.schedule.model.JobType;
import com.oceanbase.odc.service.session.factory.DefaultConnectSessionFactory;
Expand All @@ -45,9 +44,6 @@
@ScheduleTaskPreprocessor(type = JobType.DATA_DELETE)
public class DataDeletePreprocessor extends AbstractDlmJobPreprocessor {

@Autowired
private DlmEnvironment dlmEnvironment;

@Autowired
private AuthenticationFacade authenticationFacade;

Expand All @@ -69,9 +65,6 @@ public void process(CreateFlowInstanceReq req) {
// Throw exception when the specified database does not exist or the current user does not have
// permission to access it.
Database sourceDb = databaseService.detail(dataDeleteParameters.getDatabaseId());
if (dlmEnvironment.isSysTenantUserRequired()) {
checkDatasource(sourceDb.getDataSource());
}

ConnectionConfig dataSource = sourceDb.getDataSource();
dataSource.setDefaultSchema(sourceDb.getName());
Expand All @@ -98,7 +91,7 @@ public void process(CreateFlowInstanceReq req) {
if (dataDeleteParameters.getRateLimit().getDataSizeLimit() != null) {
limiterConfig.setDataSizeLimit(dataDeleteParameters.getRateLimit().getDataSizeLimit());
}
if (dataDeleteParameters.getRateLimit().getRowLimit() != null) {
if (dataDeleteParameters.getRateLimit().getBatchSize() != null) {
limiterConfig.setBatchSize(dataDeleteParameters.getRateLimit().getBatchSize());
}
limiterService.createAndBindToOrder(scheduleEntity.getId(), limiterConfig);
Expand Down
34 changes: 0 additions & 34 deletions ...sktop-starter/src/main/java/com/oceanbase/odc/service/schedule/DesktopDlmEnvironment.java
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions ...rters/web-starter/src/main/java/com/oceanbase/odc/service/schedule/WebDlmEnvironment.java
View file
Open in desktop

This file was deleted.