From 946309424c457d841fad27e6aac42648f37f69cf Mon Sep 17 00:00:00 2001
From: Grant Palau Spencer <gspencer@linkedin.com>
Date: Mon, 27 Jan 2025 14:13:46 -0800
Subject: [PATCH] cleanup logging

---
 .../ParticipantDeregistrationStage.java       | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/ParticipantDeregistrationStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/ParticipantDeregistrationStage.java
index a6464a42a0..9d90330864 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/ParticipantDeregistrationStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/ParticipantDeregistrationStage.java
@@ -62,14 +62,8 @@ public void execute(ClusterEvent event) throws Exception {
       }
     }
 
-    if (!participantsToDeregister.isEmpty()) {
-      Set<String> successfullyDeregisteredParticipants =
-        deregisterParticipants(manager, cache, participantsToDeregister);
-      if (!successfullyDeregisteredParticipants.isEmpty()) {
-        LOG.info("Successfully deregistered {} participants from cluster {}",
-              successfullyDeregisteredParticipants.size(), cache.getClusterName());
-      }
-    }
+    deregisterParticipants(manager, cache, participantsToDeregister);
+
     // Schedule the next deregister task
     if (nextDeregisterTime != Long.MAX_VALUE) {
       long delay = Math.max(nextDeregisterTime - System.currentTimeMillis(), 0);
@@ -77,13 +71,18 @@ public void execute(ClusterEvent event) throws Exception {
     }
   }
 
-  private Set<String> deregisterParticipants(HelixManager manager, ResourceControllerDataProvider cache,
+  private void deregisterParticipants(HelixManager manager, ResourceControllerDataProvider cache,
       Set<String> instancesToDeregister) {
     Set<String> successfullyDeregisteredInstances = new HashSet<>();
 
     if (manager == null || !manager.isConnected() || cache == null || instancesToDeregister == null) {
-      LOG.info("ParticipantDeregistrationStage failed due to HelixManager being null or not connected!");
-      return successfullyDeregisteredInstances;
+      LOG.warn("ParticipantDeregistrationStage failed due to HelixManager being null or not connected!");
+      return;
+    }
+
+    if (instancesToDeregister.isEmpty()) {
+      LOG.debug("There are no instances to deregister from cluster {}", cache.getClusterName());
+      return;
     }
 
     // Perform safety checks before deregistering the instances
@@ -104,11 +103,10 @@ private Set<String> deregisterParticipants(HelixManager manager, ResourceControl
       try {
         manager.getClusterManagmentTool().dropInstance(cache.getClusterName(), instanceConfig);
         successfullyDeregisteredInstances.add(instanceName);
+        LOG.info("Successfully deregistered instance {} from cluster {}", instanceName, cache.getClusterName());
       } catch (HelixException e) {
         LOG.warn("Failed to deregister instance {} from cluster {}", instanceName, cache.getClusterName(), e);
       }
     }
-
-    return successfullyDeregisteredInstances;
   }
 }