Skip to content

[fix](fe) Cancel rebuilt VCG warm up jobs on drop #65426

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

Open
deardeng wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix](fe) Cancel rebuilt VCG warm up jobs on drop #65426

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
9 changes: 8 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudInstanceStatusChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,14 @@ private void syncFileCacheTasksForVirtualGroup(Cloud.ClusterPB virtualGroupInMs,
long jobIdEvent = cacheHotspotManager.createJob(eventStmtPeriodic);
// send jobIds to ms
List<String> newJobIds = Arrays.asList(Long.toString(jobIdPeriodic), Long.toString(jobIdEvent));
CloudSystemInfoService.updateFileCacheJobIds(virtualGroupInFe, newJobIds);
boolean updated = CloudSystemInfoService.updateFileCacheJobIds(virtualGroupInFe, newJobIds);
if (!updated) {
LOG.warn("virtual compute group {}, failed to update new jobIds periodic={}, event={} to ms",
virtualGroupInFe.getName(), jobIdPeriodic, jobIdEvent);
cancelCacheJobs(virtualGroupInFe, newJobIds);
return;
}
virtualGroupInFe.getPolicy().setCacheWarmupJobIds(newJobIds);
LOG.info("virtual compute group {}, generate new jobIds periodic={}, event={}, and old jobIds {}",
virtualGroupInFe, jobIdPeriodic, jobIdEvent, jobIdsInMs);
} catch (AnalysisException e) {
Expand Down
5 changes: 4 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/cloud/system/CloudSystemInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ public synchronized void updateFrontends(List<Frontend> toAdd, List<Frontend> to
}
}

public static void updateFileCacheJobIds(ComputeGroup cg, List<String> jobIds) {
public static boolean updateFileCacheJobIds(ComputeGroup cg, List<String> jobIds) {
Cloud.ClusterPolicy policy = Cloud.ClusterPolicy.newBuilder()
.setType(Cloud.ClusterPolicy.PolicyType.ActiveStandby)
.addAllCacheWarmupJobids(jobIds).build();
Expand All @@ -564,9 +564,12 @@ public static void updateFileCacheJobIds(ComputeGroup cg, List<String> jobIds) {
LOG.info("update file cache jobIds, request: {}, response: {}", request, response);
if (response.getStatus().getCode() != Cloud.MetaServiceCode.OK) {
LOG.warn("update file cache jobIds, response: {}", response);
return false;
}
return true;
} catch (RpcException e) {
LOG.warn("failed to update file cache jobIds {}", cg, e);
return false;
}
}

Expand Down
116 changes: 113 additions & 3 deletions fe/fe-core/src/test/java/org/apache/doris/cloud/catalog/CloudInstanceStatusCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void testSyncInstanceCreatesVirtualComputeGroupAndCancelsTableLevelLoadEv
try (MockedStatic<CloudSystemInfoService> mockedCloudSystemInfoService =
Mockito.mockStatic(CloudSystemInfoService.class, Mockito.CALLS_REAL_METHODS)) {
mockedCloudSystemInfoService.when(() -> CloudSystemInfoService.updateFileCacheJobIds(
Mockito.any(ComputeGroup.class), Mockito.anyList())).thenAnswer(invocation -> null);
Mockito.any(ComputeGroup.class), Mockito.anyList())).thenReturn(true);

new CloudInstanceStatusChecker(cloudSystemInfoService).runAfterCatalogReady();
mockedCloudSystemInfoService.verify(() -> CloudSystemInfoService.updateFileCacheJobIds(
Expand Down Expand Up @@ -169,12 +169,99 @@ public void testSyncInstanceCreatesVirtualComputeGroupAndCancelsTableLevelLoadEv
Assertions.assertTrue(logs.contains("generate new jobIds"), logs);
}

@Test
public void testDropVirtualComputeGroupCancelsRebuiltWarmUpJobs() throws Exception {
addComputeGroup("active_cg_id", "active_cg");
addComputeGroup("standby_cg_id", "standby_cg");
long oldPeriodicJobId = cacheHotspotManager.createJob(
buildPeriodicStmt("active_cg", "standby_cg"));
long oldEventJobId = cacheHotspotManager.createJob(
buildEventDrivenStmt("active_cg", "standby_cg"));

ComputeGroup virtualComputeGroup = new ComputeGroup("vcg_id", "vcg",
ComputeGroup.ComputeTypeEnum.VIRTUAL);
virtualComputeGroup.setSubComputeGroups(Arrays.asList("active_cg", "standby_cg"));
ComputeGroup.Policy policy = new ComputeGroup.Policy();
policy.setActiveComputeGroup("active_cg");
policy.setStandbyComputeGroup("standby_cg");
policy.setCacheWarmupJobIds(Arrays.asList(
Long.toString(oldPeriodicJobId), Long.toString(oldEventJobId)));
virtualComputeGroup.setPolicy(policy);
cloudSystemInfoService.addComputeGroup("vcg_id", virtualComputeGroup);

Mockito.when(cloudEnv.isMaster()).thenReturn(true);
Mockito.doReturn(instanceResponseWithVirtualComputeGroup("standby_cg", "active_cg"))
.doReturn(instanceResponseWithoutVirtualComputeGroup())
.when(cloudSystemInfoService).getCloudInstance();

try (MockedStatic<CloudSystemInfoService> mockedCloudSystemInfoService =
Mockito.mockStatic(CloudSystemInfoService.class, Mockito.CALLS_REAL_METHODS)) {
mockedCloudSystemInfoService.when(() -> CloudSystemInfoService.updateFileCacheJobIds(
Mockito.any(ComputeGroup.class), Mockito.anyList())).thenReturn(true);

CloudInstanceStatusChecker checker = new CloudInstanceStatusChecker(cloudSystemInfoService);
checker.runAfterCatalogReady();
List<Long> rebuiltJobIds = cacheHotspotManager.getCloudWarmUpJobs().values().stream()
.filter(job -> job.getJobType() == CloudWarmUpJob.JobType.CLUSTER)
.filter(job -> "standby_cg".equals(job.getSrcClusterName()))
.filter(job -> "active_cg".equals(job.getDstClusterName()))
.map(CloudWarmUpJob::getJobId)
.collect(java.util.stream.Collectors.toList());
Assertions.assertEquals(2, rebuiltJobIds.size());

checker.runAfterCatalogReady();

for (long rebuiltJobId : rebuiltJobIds) {
CloudWarmUpJob job = cacheHotspotManager.getCloudWarmUpJob(rebuiltJobId);
Assertions.assertEquals(CloudWarmUpJob.JobState.CANCELLED, job.getJobState(),
"rebuilt warm up job should be cancelled when VCG is dropped: " + rebuiltJobId);
}
}
}

@Test
public void testRebuildCancelsNewWarmUpJobsWhenUpdateJobIdsFails() {
addComputeGroup("active_cg_id", "active_cg");
addComputeGroup("standby_cg_id", "standby_cg");
Mockito.when(cloudEnv.isMaster()).thenReturn(true);
Mockito.doReturn(instanceResponseWithVirtualComputeGroup()).when(cloudSystemInfoService).getCloudInstance();

try (MockedStatic<CloudSystemInfoService> mockedCloudSystemInfoService =
Mockito.mockStatic(CloudSystemInfoService.class, Mockito.CALLS_REAL_METHODS)) {
mockedCloudSystemInfoService.when(() -> CloudSystemInfoService.updateFileCacheJobIds(
Mockito.any(ComputeGroup.class), Mockito.anyList())).thenReturn(false);

new CloudInstanceStatusChecker(cloudSystemInfoService).runAfterCatalogReady();
mockedCloudSystemInfoService.verify(() -> CloudSystemInfoService.updateFileCacheJobIds(
Mockito.any(ComputeGroup.class), Mockito.anyList()));
}

ComputeGroup virtualComputeGroup = cloudSystemInfoService.getComputeGroupById("vcg_id");
Assertions.assertNotNull(virtualComputeGroup);
Assertions.assertTrue(virtualComputeGroup.isNeedRebuildFileCache());
Assertions.assertTrue(virtualComputeGroup.getPolicy().getCacheWarmupJobIds().isEmpty());

List<CloudWarmUpJob> newWarmUpJobs = cacheHotspotManager.getCloudWarmUpJobs().values().stream()
.filter(job -> job.getJobType() == CloudWarmUpJob.JobType.CLUSTER)
.filter(job -> "active_cg".equals(job.getSrcClusterName()))
.filter(job -> "standby_cg".equals(job.getDstClusterName()))
.collect(java.util.stream.Collectors.toList());
Assertions.assertEquals(2, newWarmUpJobs.size());
for (CloudWarmUpJob job : newWarmUpJobs) {
Assertions.assertEquals(CloudWarmUpJob.JobState.CANCELLED, job.getJobState());
}
}

private void addComputeGroup(String computeGroupId, String computeGroupName) {
cloudSystemInfoService.addComputeGroup(computeGroupId,
new ComputeGroup(computeGroupId, computeGroupName, ComputeGroup.ComputeTypeEnum.COMPUTE));
}

private Cloud.GetInstanceResponse instanceResponseWithVirtualComputeGroup() {
return instanceResponseWithVirtualComputeGroup("active_cg", "standby_cg");
}

private Cloud.GetInstanceResponse instanceResponseWithVirtualComputeGroup(String active, String standby) {
Cloud.ClusterPB activeComputeGroup = computeGroup("active_cg_id", "active_cg");
Cloud.ClusterPB standbyComputeGroup = computeGroup("standby_cg_id", "standby_cg");
Cloud.ClusterPB virtualComputeGroup = Cloud.ClusterPB.newBuilder()
Expand All @@ -185,8 +272,8 @@ private Cloud.GetInstanceResponse instanceResponseWithVirtualComputeGroup() {
.addClusterNames("standby_cg")
.setClusterPolicy(Cloud.ClusterPolicy.newBuilder()
.setType(Cloud.ClusterPolicy.PolicyType.ActiveStandby)
.setActiveClusterName("active_cg")
.addStandbyClusterNames("standby_cg")
.setActiveClusterName(active)
.addStandbyClusterNames(standby)
.build())
.build();
return Cloud.GetInstanceResponse.newBuilder()
Expand All @@ -203,6 +290,22 @@ private Cloud.GetInstanceResponse instanceResponseWithVirtualComputeGroup() {
.build();
}

private Cloud.GetInstanceResponse instanceResponseWithoutVirtualComputeGroup() {
Cloud.ClusterPB activeComputeGroup = computeGroup("active_cg_id", "active_cg");
Cloud.ClusterPB standbyComputeGroup = computeGroup("standby_cg_id", "standby_cg");
return Cloud.GetInstanceResponse.newBuilder()
.setStatus(Cloud.MetaServiceResponseStatus.newBuilder()
.setCode(Cloud.MetaServiceCode.OK)
.setMsg("OK")
.build())
.setInstance(Cloud.InstanceInfoPB.newBuilder()
.setStatus(Cloud.InstanceInfoPB.Status.NORMAL)
.addClusters(activeComputeGroup)
.addClusters(standbyComputeGroup)
.build())
.build();
}

private Cloud.ClusterPB computeGroup(String computeGroupId, String computeGroupName) {
return Cloud.ClusterPB.newBuilder()
.setClusterId(computeGroupId)
Expand Down Expand Up @@ -241,6 +344,13 @@ private WarmUpClusterCommand buildEventDrivenStmt(String src, String dst, TableF
properties, Arrays.asList(rules));
}

private WarmUpClusterCommand buildPeriodicStmt(String src, String dst) {
Map<String, String> properties = new HashMap<>();
properties.put("sync_mode", "periodic");
properties.put("sync_interval_sec", "600");
return new WarmUpClusterCommand(new ArrayList<>(), src, dst, false, false, properties);
}

private static class RecordingAppender extends AbstractAppender {
private final List<String> messages = new ArrayList<>();

Expand Down
Loading