Skip to content

[fix](fe) Keep running export jobs during history cleanup#67539

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

Draft
wyxxxcat wants to merge 1 commit into
base:master
Choose a base branch
from
+82 −6
Draft

[fix](fe) Keep running export jobs during history cleanup #67539

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
16 changes: 10 additions & 6 deletions fe/fe-core/src/main/java/org/apache/doris/load/ExportMgr.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -485,15 +485,19 @@ public void removeOldExportJobs() {
if (exportIdToJob.size() > Config.max_export_history_job_num) {
List<Map.Entry<Long, ExportJob>> jobList = new ArrayList<>(exportIdToJob.entrySet());
jobList.sort(Comparator.comparingLong(entry -> entry.getValue().getCreateTimeMs()));
while (exportIdToJob.size() > Config.max_export_history_job_num) {
// Remove the oldest job
Map.Entry<Long, ExportJob> oldestEntry = jobList.remove(0);
Iterator<Map.Entry<Long, ExportJob>> jobIterator = jobList.iterator();
while (exportIdToJob.size() > Config.max_export_history_job_num && jobIterator.hasNext()) {
Map.Entry<Long, ExportJob> oldestEntry = jobIterator.next();
ExportJob job = oldestEntry.getValue();
if (job.getState() != ExportJobState.CANCELLED && job.getState() != ExportJobState.FINISHED) {
continue;
}
exportIdToJob.remove(oldestEntry.getKey());
Map<String, Long> labelJobs = dbTolabelToExportJobId.get(oldestEntry.getValue().getDbId());
Map<String, Long> labelJobs = dbTolabelToExportJobId.get(job.getDbId());
if (labelJobs != null) {
labelJobs.remove(oldestEntry.getValue().getLabel());
labelJobs.remove(job.getLabel());
if (labelJobs.isEmpty()) {
dbTolabelToExportJobId.remove(oldestEntry.getValue().getDbId());
dbTolabelToExportJobId.remove(job.getDbId());
}
}
}
Expand Down
72 changes: 72 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/load/loadv2/ExportMgrTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,78 @@ public void testRemoveOldExportJobs() {
}
}

@Test
public void testRemoveOldExportJobsKeepsRunningJobs() {
ExportMgr isolatedExportMgr = new ExportMgr();
int originalMaxHistoryJobNum = Config.max_export_history_job_num;
Config.max_export_history_job_num = 2;
try {
long currentTime = System.currentTimeMillis();
ExportJob pendingJob = makeExportJob(1001, "pending");
Deencapsulation.setField(pendingJob, "createTimeMs", currentTime - 4000);
Deencapsulation.setField(pendingJob, "state", ExportJobState.PENDING);
isolatedExportMgr.unprotectAddJob(pendingJob);

ExportJob exportingJob = makeExportJob(1002, "exporting");
Deencapsulation.setField(exportingJob, "createTimeMs", currentTime - 3000);
Deencapsulation.setField(exportingJob, "state", ExportJobState.EXPORTING);
isolatedExportMgr.unprotectAddJob(exportingJob);

ExportJob finishedJob = makeExportJob(1003, "finished");
Deencapsulation.setField(finishedJob, "createTimeMs", currentTime - 2000);
Deencapsulation.setField(finishedJob, "state", ExportJobState.FINISHED);
isolatedExportMgr.unprotectAddJob(finishedJob);

ExportJob cancelledJob = makeExportJob(1004, "cancelled");
Deencapsulation.setField(cancelledJob, "createTimeMs", currentTime - 1000);
Deencapsulation.setField(cancelledJob, "state", ExportJobState.CANCELLED);
isolatedExportMgr.unprotectAddJob(cancelledJob);

isolatedExportMgr.removeOldExportJobs();

Assert.assertEquals(2, isolatedExportMgr.getJobs().size());
Assert.assertNotNull(isolatedExportMgr.getJob(pendingJob.getId()));
Assert.assertNotNull(isolatedExportMgr.getJob(exportingJob.getId()));
Assert.assertNull(isolatedExportMgr.getJob(finishedJob.getId()));
Assert.assertNull(isolatedExportMgr.getJob(cancelledJob.getId()));
} finally {
Config.max_export_history_job_num = originalMaxHistoryJobNum;
}
}

@Test
public void testRemoveOldExportJobsKeepsRunningJobsWhenOverLimit() {
ExportMgr isolatedExportMgr = new ExportMgr();
int originalMaxHistoryJobNum = Config.max_export_history_job_num;
Config.max_export_history_job_num = 1;
try {
long currentTime = System.currentTimeMillis();
ExportJob pendingJob = makeExportJob(2001, "pending-over-limit");
Deencapsulation.setField(pendingJob, "createTimeMs", currentTime - 3000);
Deencapsulation.setField(pendingJob, "state", ExportJobState.PENDING);
isolatedExportMgr.unprotectAddJob(pendingJob);

ExportJob exportingJob = makeExportJob(2002, "exporting-over-limit");
Deencapsulation.setField(exportingJob, "createTimeMs", currentTime - 2000);
Deencapsulation.setField(exportingJob, "state", ExportJobState.EXPORTING);
isolatedExportMgr.unprotectAddJob(exportingJob);

ExportJob inQueueJob = makeExportJob(2003, "in-queue-over-limit");
Deencapsulation.setField(inQueueJob, "createTimeMs", currentTime - 1000);
Deencapsulation.setField(inQueueJob, "state", ExportJobState.IN_QUEUE);
isolatedExportMgr.unprotectAddJob(inQueueJob);

isolatedExportMgr.removeOldExportJobs();

Assert.assertEquals(3, isolatedExportMgr.getJobs().size());
Assert.assertEquals(ExportJobState.PENDING, isolatedExportMgr.getJob(pendingJob.getId()).getState());
Assert.assertEquals(ExportJobState.EXPORTING, isolatedExportMgr.getJob(exportingJob.getId()).getState());
Assert.assertEquals(ExportJobState.IN_QUEUE, isolatedExportMgr.getJob(inQueueJob.getId()).getState());
} finally {
Config.max_export_history_job_num = originalMaxHistoryJobNum;
}
}

private ExportJob makeExportJob(long id, String label) {
ExportJob job1 = new ExportJob(id);
Deencapsulation.setField(job1, "label", label);
Expand Down
Loading