Updated ordering

linkedin · Sep 29, 2024 · e5c7449 · e5c7449
1 parent 70dd36d
commit e5c7449
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/...ces/venice-controller/src/main/java/com/linkedin/venice/pushmonitor/PushMonitorUtils.java b/...ces/venice-controller/src/main/java/com/linkedin/venice/pushmonitor/PushMonitorUtils.java
@@ -89,13 +89,6 @@ public static ExecutionStatusWithDetails getDaVinciPushStatusAndDetails(
       Set<String> incompleteInstanceList = new HashSet<>();
       ExecutionStatus errorStatus = ExecutionStatus.ERROR;
       for (Map.Entry<CharSequence, Integer> entry: instances.entrySet()) {
-        ExecutionStatus status = ExecutionStatus.valueOf(entry.getValue());
-        // We will skip completed instances, as they have stopped emitting heartbeats and will not be counted as live
-        // instances.
-        if (status == completeStatus) {
-          completedInstanceCount++;
-          continue;
-        }
         PushStatusStoreReader.InstanceStatus instanceStatus =
             reader.getInstanceStatus(storeName, entry.getKey().toString());
         if (instanceStatus.equals(PushStatusStoreReader.InstanceStatus.BOOTSTRAPPING)) {
@@ -105,6 +98,13 @@ public static ExecutionStatusWithDetails getDaVinciPushStatusAndDetails(
               topicName);
           continue;
         }
+        ExecutionStatus status = ExecutionStatus.valueOf(entry.getValue());
+        // We will skip completed instances, as they have stopped emitting heartbeats and will not be counted as live
+        // instances.
+        if (status == completeStatus) {
+          completedInstanceCount++;
+          continue;
+        }
         if (instanceStatus.equals(PushStatusStoreReader.InstanceStatus.DEAD)) {
           offlineInstanceCount++;
           // Keep at most 5 offline instances for logging purpose.
@@ -249,13 +249,6 @@ public static ExecutionStatusWithDetails getDaVinciPartitionLevelPushStatusAndDe
       boolean allInstancesCompleted = true;
       totalReplicaCount += instances.size();
       for (Map.Entry<CharSequence, Integer> entry: instances.entrySet()) {
-        ExecutionStatus status = ExecutionStatus.valueOf(entry.getValue());
-        // We will skip completed replicas, as they have stopped emitting heartbeats and will not be counted as live
-        // replicas.
-        if (status == completeStatus) {
-          completedReplicaCount++;
-          continue;
-        }
         String instanceName = entry.getKey().toString();
         PushStatusStoreReader.InstanceStatus instanceStatus = instanceLivenessCache
             .computeIfAbsent(instanceName, ignored -> reader.getInstanceStatus(storeName, instanceName));
@@ -269,6 +262,14 @@ public static ExecutionStatusWithDetails getDaVinciPartitionLevelPushStatusAndDe
               partitionId);
           continue;
         }
+
+        ExecutionStatus status = ExecutionStatus.valueOf(entry.getValue());
+        // We will skip completed replicas, as they have stopped emitting heartbeats and will not be counted as live
+        // replicas.
+        if (status == completeStatus) {
+          completedReplicaCount++;
+          continue;
+        }
         if (instanceStatus.equals(PushStatusStoreReader.InstanceStatus.DEAD)) {
           // Keep at most 5 offline instances for logging purpose.
           if (offlineInstanceList.size() < 5) {