Skip to content

Add a shutdownhook to remove jobs owned by the process #8896

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

Merged
DaanHoogland merged 2 commits into from
Apr 19, 2024
Merged

Add a shutdownhook to remove jobs owned by the process #8896

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e15925
Add a shutdownhook to remove jobs owned by the process
DaanHoogland Apr 10, 2024
1a3854a
Apply suggestions from code review
DaanHoogland Apr 10, 2024
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
16 changes: 16 additions & 0 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 @@ -316,6 +316,7 @@ public boolean start() {
_sanity = _sanityExecutor.scheduleAtFixedRate(new SanityCheck(), 1, _sanityCheckInterval, TimeUnit.DAYS);
}

Runtime.getRuntime().addShutdownHook(new AbandonJob());
TransactionLegacy usageTxn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
try {
if (_heartbeatLock.lock(3)) { // 3 second timeout
Expand Down Expand Up @@ -345,9 +346,11 @@ public boolean stop() {
if (_sanity != null) {
_sanity.cancel(true);
}

return true;
}


@Override
public void run() {
(new ManagedContextRunnable() {
Expand Down Expand Up @@ -2183,4 +2186,17 @@ protected void runInContext() {
}
}
}
private class AbandonJob extends Thread {
@Override
public void run() {
s_logger.info("exitting Usage Manager");
deleteOpenjob();
}
private void deleteOpenjob() {
UsageJobVO job = _usageJobDao.isOwner(_hostname, _pid);
if (job != null) {
_usageJobDao.remove(job.getId());
}
}
}
}