Skip to content

merge attempt 20.3 -> 22.1 #12644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DaanHoogland wants to merge 9 commits into from
Closed

merge attempt 20.3 -> 22.1 #12644

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b45726f
ssvm: delete temp directory while deleting entity download url (#12562)
shwstppr Feb 11, 2026
4de8c2b
Add a Prometheus metric to track host certificate expiry (#12613)
nvazquez Feb 11, 2026
b7c970f
Fix issue with multiple KVM Host entries in host table (#12589)
nvazquez Feb 11, 2026
34f6f41
Fix injection of preset variables into the JS interpreter (#12515)
winterhazel Feb 11, 2026
18d6659
engine/schema: fix cluster/zone settings with encrypted values (#12626)
weizhouapache Feb 12, 2026
e22f842
Allow limit queries without random ordering (#12598)
sureshanaparti Feb 13, 2026
d8230c9
Usage: Heartbeat should not schedule usage job when a job is already …
abh1sar Feb 13, 2026
ae5308b
Fix issue when restoring backup after migration of volume (#12549)
Pearl1594 Feb 13, 2026
c7f300f
merge attempt 20.3 -> 22.1
Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Usage: Heartbeat should not schedule usage job when a job is already … 
…running (#12616)
  • Loading branch information
@abh1sar
abh1sar authored Feb 13, 2026
commit d8230c9598f4b88bb422d7f6d19e3524716b4efd
20 changes: 16 additions & 4 deletions usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -367,7 +369,12 @@ public void run() {
(new ManagedContextRunnable() {
@Override
protected void runInContext() {
runInContextInternal();
isParsingJobRunning.set(true);
try {
runInContextInternal();
} finally {
isParsingJobRunning.set(false);
}
}
}).run();
}
Expand Down Expand Up @@ -2267,9 +2274,14 @@ protected void runInContext() {

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();
}
}
}

Expand Down
Loading