database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix topicPublisher thread may NPE when no topic exists (#29306)

Browse Source
This commit is contained in:
wangbo
2023-12-29 23:04:20 +08:00
committed by GitHub
parent 59fdd5e42b
commit 03ece437f0
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fe/fe-core/src/main/java/org/apache/doris/common/publish/TopicPublisherThread.java
View File

@ -66,9 +66,8 @@ public class TopicPublisherThread extends MasterDaemon {
topicPublisher.getTopicInfo(request);
}
if (request.getTopicMap().size() == 0) {
return;
}
// even request contains no group and schedule policy, we still need to send an empty rpc.
// because it may means workload group/policy is dropped
// step 2: publish topic info to all be
Collection<Backend> nodesToPublish = clusterInfoService.getIdToBackend().values();

4
fe/fe-core/src/main/java/org/apache/doris/common/publish/WorkloadGroupPublisher.java
View File

@ -35,8 +35,6 @@ public class WorkloadGroupPublisher implements TopicPublisher {
@Override
public void getTopicInfo(TPublishTopicRequest req) {
List<TopicInfo> list = env.getWorkloadGroupMgr().getPublishTopicInfo();
if (list.size() > 0) {
req.putToTopicMap(TTopicInfoType.WORKLOAD_GROUP, list);
}
req.putToTopicMap(TTopicInfoType.WORKLOAD_GROUP, list);
}
}

4
fe/fe-core/src/main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadSchedPolicyPublisher.java
View File

@ -36,9 +36,7 @@ public class WorkloadSchedPolicyPublisher implements TopicPublisher {
@Override
public void getTopicInfo(TPublishTopicRequest req) {
List<TopicInfo> list = env.getWorkloadSchedPolicyMgr().getPublishTopicInfoList();
if (list.size() > 0) {
req.putToTopicMap(TTopicInfoType.WORKLOAD_SCHED_POLICY, list);
}
req.putToTopicMap(TTopicInfoType.WORKLOAD_SCHED_POLICY, list);
}
}