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

DaanHoogland · sureshanaparti · web-flow · commit 5f8450f28f12 · 2024-04-19T09:18:41.000+02:00
Co-authored-by: Suresh Kumar Anaparti &lt;sureshkumar.anaparti@gmail.com&gt;
diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
@@ -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
@@ -345,9 +346,11 @@ public boolean stop() {
         if (_sanity != null) {
             _sanity.cancel(true);
         }
+
         return true;
     }
 
+
     @Override
     public void run() {
         (new ManagedContextRunnable() {
@@ -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());
+            }
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -316,6 +316,7 @@ public boolean start() {`
`316`	`316`	`_sanity = _sanityExecutor.scheduleAtFixedRate(new SanityCheck(), 1, _sanityCheckInterval, TimeUnit.DAYS);`
`317`	`317`	`}`
`318`	`318`
	`319`	`+ Runtime.getRuntime().addShutdownHook(new AbandonJob());`
`319`	`320`	`TransactionLegacy usageTxn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);`
`320`	`321`	`try {`
`321`	`322`	`if (_heartbeatLock.lock(3)) { // 3 second timeout`
`@@ -345,9 +346,11 @@ public boolean stop() {`
`345`	`346`	`if (_sanity != null) {`
`346`	`347`	`_sanity.cancel(true);`
`347`	`348`	`}`
	`349`	`+`
`348`	`350`	`return true;`
`349`	`351`	`}`
`350`	`352`
	`353`	`+`
`351`	`354`	`@Override`
`352`	`355`	`public void run() {`
`353`	`356`	`(new ManagedContextRunnable() {`
`@@ -2183,4 +2186,17 @@ protected void runInContext() {`
`2183`	`2186`	`}`
`2184`	`2187`	`}`
`2185`	`2188`	`}`
	`2189`	`+ private class AbandonJob extends Thread {`
	`2190`	`+ @Override`
	`2191`	`+ public void run() {`
	`2192`	`+ s_logger.info("exitting Usage Manager");`
	`2193`	`+ deleteOpenjob();`
	`2194`	`+ }`
	`2195`	`+ private void deleteOpenjob() {`
	`2196`	`+ UsageJobVO job = _usageJobDao.isOwner(_hostname, _pid);`
	`2197`	`+ if (job != null) {`
	`2198`	`+ _usageJobDao.remove(job.getId());`
	`2199`	`+ }`
	`2200`	`+ }`
	`2201`	`+ }`
`2186`	`2202`	`}`