(cloudstack) branch 4.20 updated: Usage: Heartbeat should not schedule usage job when a job is already running (#12616)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new d8230c9598f Usage: Heartbeat should not schedule usage job when a job 
is already running (#12616)
d8230c9598f is described below

commit d8230c9598f4b88bb422d7f6d19e3524716b4efd
Author: Abhisar Sinha <63767682+abh1...@users.noreply.github.com>
AuthorDate: Fri Feb 13 15:28:04 2026 +0530

    Usage: Heartbeat should not schedule usage job when a job is already 
running (#12616)
---
 .../main/java/com/cloud/usage/UsageManagerImpl.java  | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java 
b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
index 9da64889fc3..2db91ab0e35 100644
--- a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
@@ -31,6 +31,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.cloud.network.Network;
 import com.cloud.usage.dao.UsageNetworksDao;
@@ -192,6 +193,7 @@ public class UsageManagerImpl extends ManagerBase 
implements UsageManager, Runna
     private final List<UsageVmDiskVO> usageVmDisks = new 
ArrayList<UsageVmDiskVO>();
 
     private final ScheduledExecutorService _executor = 
Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Usage-Job"));
+    private final AtomicBoolean isParsingJobRunning = new AtomicBoolean(false);
     private final ScheduledExecutorService _heartbeatExecutor = 
Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Usage-HB"));
     private final ScheduledExecutorService _sanityExecutor = 
Executors.newSingleThreadScheduledExecutor(new 
NamedThreadFactory("Usage-Sanity"));
     private Future _scheduledFuture = null;
@@ -367,7 +369,12 @@ public class UsageManagerImpl extends ManagerBase 
implements UsageManager, Runna
         (new ManagedContextRunnable() {
             @Override
             protected void runInContext() {
-                runInContextInternal();
+                isParsingJobRunning.set(true);
+                try {
+                    runInContextInternal();
+                } finally {
+                    isParsingJobRunning.set(false);
+                }
             }
         }).run();
     }
@@ -2267,9 +2274,14 @@ public class UsageManagerImpl extends ManagerBase 
implements UsageManager, Runna
 
                         if ((timeSinceLastSuccessJob > 0) && 
(timeSinceLastSuccessJob > (aggregationDurationMillis - 100))) {
                             if (timeToJob > (aggregationDurationMillis / 2)) {
-                                logger.debug("it's been {} ms since last usage 
job and {} ms until next job, scheduling an immediate job to catch up 
(aggregation duration is {} minutes)"
-                                    , timeSinceLastSuccessJob, timeToJob, 
_aggregationDuration);
-                                scheduleParse();
+                                logger.debug("Heartbeat: it's been {} ms since 
last finished usage job and {} ms until next job (aggregation duration is {} 
minutes)",
+                                        timeSinceLastSuccessJob, timeToJob, 
_aggregationDuration);
+                                if (isParsingJobRunning.get()) {
+                                    logger.debug("Heartbeat: A parsing job is 
already running");
+                                } else {
+                                    logger.debug("Heartbeat: Scheduling an 
immediate job to catch up");
+                                    scheduleParse();
+                                }
                             }
                         }