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

HappenLee · Jan 12, 2024 · d55bdb7 · d55bdb7
1 parent 545cdf3
commit d55bdb7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/publish/TopicPublisherThread.java b/fe/fe-core/src/main/java/org/apache/doris/common/publish/TopicPublisherThread.java
@@ -66,9 +66,8 @@ protected void runAfterCatalogReady() {
             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();

diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/publish/WorkloadGroupPublisher.java b/fe/fe-core/src/main/java/org/apache/doris/common/publish/WorkloadGroupPublisher.java
@@ -35,8 +35,6 @@ public WorkloadGroupPublisher(Env env) {
     @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);
     }
 }
diff --git a/...main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadSchedPolicyPublisher.java b/...main/java/org/apache/doris/resource/workloadschedpolicy/WorkloadSchedPolicyPublisher.java
@@ -36,9 +36,7 @@ public WorkloadSchedPolicyPublisher(Env env) {
     @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);
     }
 
 }