Merge branch '4.20'

Daan Hoogland · Daan Hoogland · commit b57994eeb0d9 · 2025-07-16T14:05:19.000+02:00
diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDao.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDao.java
@@ -37,4 +37,6 @@ public interface UsageJobDao extends GenericDao<UsageJobVO, Long> {
     UsageJobVO isOwner(String hostname, int pid);
 
     void updateJobSuccess(Long jobId, long startMillis, long endMillis, long execTime, boolean success);
+
+    void removeLastOpenJobsOwned(String hostname, int pid);
 }
diff --git a/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java b/engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java
@@ -22,6 +22,7 @@
 import java.util.List;
 
 
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import com.cloud.usage.UsageJobVO;
@@ -114,7 +115,7 @@ public Long checkHeartbeat(String hostname, int pid, int aggregationDuration) {
     public UsageJobVO isOwner(String hostname, int pid) {
         TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
         try {
-            if ((hostname == null) || (pid <= 0)) {
+            if (hostname == null || pid <= 0) {
                 return null;
             }
 
@@ -174,7 +175,7 @@ public UsageJobVO getNextImmediateJob() {
         SearchCriteria<UsageJobVO> sc = createSearchCriteria();
         sc.addAnd("endMillis", SearchCriteria.Op.EQ, Long.valueOf(0));
         sc.addAnd("jobType", SearchCriteria.Op.EQ, Integer.valueOf(UsageJobVO.JOB_TYPE_SINGLE));
-        sc.addAnd("scheduled", SearchCriteria.Op.EQ, Integer.valueOf(0));
+        sc.addAnd("scheduled", SearchCriteria.Op.EQ, Integer.valueOf(UsageJobVO.JOB_NOT_SCHEDULED));
         List<UsageJobVO> jobs = search(sc, filter);
 
         if ((jobs == null) || jobs.isEmpty()) {
@@ -194,4 +195,36 @@ public Date getLastHeartbeat() {
         }
         return jobs.get(0).getHeartbeat();
     }
+
+    private List<UsageJobVO> getLastOpenJobsOwned(String hostname, int pid) {
+        SearchCriteria<UsageJobVO> sc = createSearchCriteria();
+        sc.addAnd("endMillis", SearchCriteria.Op.EQ, Long.valueOf(0));
+        sc.addAnd("host", SearchCriteria.Op.EQ, hostname);
+        if (pid > 0) {
+            sc.addAnd("pid", SearchCriteria.Op.EQ, Integer.valueOf(pid));
+        }
+        return listBy(sc);
+    }
+
+    @Override
+    public void removeLastOpenJobsOwned(String hostname, int pid) {
+        if (hostname == null) {
+            return;
+        }
+
+        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);
+        try {
+            List<UsageJobVO> jobs = getLastOpenJobsOwned(hostname, pid);
+            if (CollectionUtils.isNotEmpty(jobs)) {
+                logger.info("Found {} opens job, to remove", jobs.size());
+                for (UsageJobVO job : jobs) {
+                    logger.debug("Removing job - id: {}, pid: {}, job type: {}, scheduled: {}, heartbeat: {}",
+                            job.getId(), job.getPid(), job.getJobType(), job.getScheduled(), job.getHeartbeat());
+                    remove(job.getId());
+                }
+            }
+        } finally {
+            txn.close();
+        }
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptor.java
@@ -653,24 +653,10 @@ public Ternary<Boolean, Map<String, String>, String> prepareStorageClient(String
             if (!ScaleIOUtil.startSDCService()) {
                 return new Ternary<>(false, null, "Couldn't start SDC service on host");
             }
-        }
-
-        if (MapUtils.isNotEmpty(details) && details.containsKey(ScaleIOGatewayClient.STORAGE_POOL_MDMS)) {
-            // Assuming SDC service is started, add mdms
-            String mdms = details.get(ScaleIOGatewayClient.STORAGE_POOL_MDMS);
-            String[] mdmAddresses = mdms.split(",");
-            if (mdmAddresses.length > 0) {
-                if (ScaleIOUtil.isMdmPresent(mdmAddresses[0])) {
-                    return new Ternary<>(true, getSDCDetails(details), "MDM added, no need to prepare the SDC client");
-                }
-
-                ScaleIOUtil.addMdms(mdmAddresses);
-                if (!ScaleIOUtil.isMdmPresent(mdmAddresses[0])) {
-                    return new Ternary<>(false, null, "Failed to add MDMs");
-                } else {
-                    logger.debug(String.format("MDMs %s added to storage pool %s", mdms, uuid));
-                    applyMdmsChangeWaitTime(details);
-                }
+        } else {
+            logger.debug("SDC service is active on host, re-starting it");
+            if (!ScaleIOUtil.restartSDCService()) {
+                return new Ternary<>(false, null, "Couldn't restart SDC service on host");
             }
         }
 
@@ -798,12 +784,12 @@ private Map<String, String> getSDCDetails(Map<String, String> details) {
             if (sdcId != null) {
                 sdcDetails.put(ScaleIOGatewayClient.SDC_ID, sdcId);
                 return sdcDetails;
-            }
-
-            String sdcGuId = ScaleIOUtil.getSdcGuid();
-            if (sdcGuId != null) {
-                sdcDetails.put(ScaleIOGatewayClient.SDC_GUID, sdcGuId);
-                return sdcDetails;
+            } else {
+                String sdcGuId = ScaleIOUtil.getSdcGuid();
+                if (sdcGuId != null) {
+                    sdcDetails.put(ScaleIOGatewayClient.SDC_GUID, sdcGuId);
+                    return sdcDetails;
+                }
             }
 
             try {
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java
@@ -92,6 +92,34 @@ public void testPrepareStorageClient_SDCServiceNotEnabled() {
         Assert.assertEquals("SDC service not enabled on host", result.third());
     }
 
+    @Test
+    public void testPrepareStorageClient_SDCServiceNotRestarted() {
+        when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl status scini"))).thenReturn(3);
+        when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl is-enabled scini"))).thenReturn(0);
+        when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl is-active scini"))).thenReturn(0);
+        when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl restart scini"))).thenReturn(1);
+
+        Ternary<Boolean, Map<String, String>, String> result = scaleIOStorageAdaptor.prepareStorageClient(poolUuid, new HashMap<>());
+
+        Assert.assertFalse(result.first());
+        Assert.assertNull(result.second());
+        Assert.assertEquals("Couldn't restart SDC service on host", result.third());
+    }
+
+    @Test
+    public void testPrepareStorageClient_SDCServiceRestarted() {
+        when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl status scini"))).thenReturn(3);
+        when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl is-enabled scini"))).thenReturn(0);
+        when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl is-active scini"))).thenReturn(0);
+        when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl restart scini"))).thenReturn(0);
+
+        Ternary<Boolean, Map<String, String>, String> result = scaleIOStorageAdaptor.prepareStorageClient(poolUuid, new HashMap<>());
+
+        Assert.assertFalse(result.first());
+        Assert.assertNull(result.second());
+        Assert.assertEquals("Couldn't get the SDC details on the host", result.third());
+    }
+
     @Test
     public void testPrepareStorageClient_SDCServiceNotStarted() {
         when(Script.runSimpleBashScriptForExitValue(Mockito.eq("systemctl status scini"))).thenReturn(3);
diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.systemvm.template.location>https://download.cloudstack.org/systemvm</project.systemvm.template.location>
-        <project.systemvm.template.version>4.20.1.0</project.systemvm.template.version>
+        <project.systemvm.template.version>4.20.2.0</project.systemvm.template.version>
         <sonar.organization>apache</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
diff --git a/tools/appliance/systemvmtemplate/scripts/finalize.sh b/tools/appliance/systemvmtemplate/scripts/finalize.sh
@@ -68,6 +68,7 @@ function zero_disk() {
 }
 
 function finalize() {
+  depmod -a
   configure_misc
   configure_rundisk_size
   configure_sudoers
diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java
@@ -312,6 +312,9 @@ public boolean start() {
             logger.info("Starting Usage Manager");
         }
 
+        _usageJobDao.removeLastOpenJobsOwned(_hostname, 0);
+        Runtime.getRuntime().addShutdownHook(new AbandonJob());
+
         // use the configured exec time and aggregation duration for scheduling the job
         _scheduledFuture =
                 _executor.scheduleAtFixedRate(this, _jobExecTime.getTimeInMillis() - System.currentTimeMillis(), _aggregationDuration * 60 * 1000, TimeUnit.MILLISECONDS);
@@ -324,7 +327,6 @@ 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
@@ -2148,19 +2150,17 @@ protected void runInContext() {
                         // the aggregation range away from executing the next job
                         long now = System.currentTimeMillis();
                         long timeToJob = _jobExecTime.getTimeInMillis() - now;
-                        long timeSinceJob = 0;
+                        long timeSinceLastSuccessJob = 0;
                         long aggregationDurationMillis = _aggregationDuration * 60L * 1000L;
                         long lastSuccess = _usageJobDao.getLastJobSuccessDateMillis();
                         if (lastSuccess > 0) {
-                            timeSinceJob = now - lastSuccess;
+                            timeSinceLastSuccessJob = now - lastSuccess;
                         }
 
-                        if ((timeSinceJob > 0) && (timeSinceJob > (aggregationDurationMillis - 100))) {
+                        if ((timeSinceLastSuccessJob > 0) && (timeSinceLastSuccessJob > (aggregationDurationMillis - 100))) {
                             if (timeToJob > (aggregationDurationMillis / 2)) {
-                                if (logger.isDebugEnabled()) {
-                                    logger.debug("it's been " + timeSinceJob + " ms since last usage job and " + timeToJob +
-                                            " ms until next job, scheduling an immediate job to catch up (aggregation duration is " + _aggregationDuration + " minutes)");
-                                }
+                                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();
                             }
                         }
@@ -2245,17 +2245,12 @@ protected void runInContext() {
             }
         }
     }
+
     private class AbandonJob extends Thread {
         @Override
         public void run() {
-            logger.info("exitting Usage Manager");
-            deleteOpenjob();
-        }
-        private void deleteOpenjob() {
-            UsageJobVO job = _usageJobDao.isOwner(_hostname, _pid);
-            if (job != null) {
-                _usageJobDao.remove(job.getId());
-            }
+            logger.info("exiting Usage Manager");
+            _usageJobDao.removeLastOpenJobsOwned(_hostname, _pid);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,6 @@ public interface UsageJobDao extends GenericDao<UsageJobVO, Long> {`
`37`	`37`	`UsageJobVO isOwner(String hostname, int pid);`
`38`	`38`
`39`	`39`	`void updateJobSuccess(Long jobId, long startMillis, long endMillis, long execTime, boolean success);`
	`40`	`+`
	`41`	`+ void removeLastOpenJobsOwned(String hostname, int pid);`
`40`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ function zero_disk() {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`function finalize() {`
	`71`	`+ depmod -a`
`71`	`72`	`configure_misc`
`72`	`73`	`configure_rundisk_size`
`73`	`74`	`configure_sudoers`
Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,9 @@ public boolean start() {`
`312`	`312`	`logger.info("Starting Usage Manager");`
`313`	`313`	`}`
`314`	`314`
	`315`	`+ _usageJobDao.removeLastOpenJobsOwned(_hostname, 0);`
	`316`	`+ Runtime.getRuntime().addShutdownHook(new AbandonJob());`
	`317`	`+`
`315`	`318`	`// use the configured exec time and aggregation duration for scheduling the job`
`316`	`319`	`_scheduledFuture =`
`317`	`320`	`_executor.scheduleAtFixedRate(this, _jobExecTime.getTimeInMillis() - System.currentTimeMillis(), _aggregationDuration * 60 * 1000, TimeUnit.MILLISECONDS);`
`@@ -324,7 +327,6 @@ public boolean start() {`
`324`	`327`	`_sanity = _sanityExecutor.scheduleAtFixedRate(new SanityCheck(), 1, _sanityCheckInterval, TimeUnit.DAYS);`
`325`	`328`	`}`
`326`	`329`
`327`		`- Runtime.getRuntime().addShutdownHook(new AbandonJob());`
`328`	`330`	`TransactionLegacy usageTxn = TransactionLegacy.open(TransactionLegacy.USAGE_DB);`
`329`	`331`	`try {`
`330`	`332`	`if (_heartbeatLock.lock(3)) { // 3 second timeout`
`@@ -2148,19 +2150,17 @@ protected void runInContext() {`
`2148`	`2150`	`// the aggregation range away from executing the next job`
`2149`	`2151`	`long now = System.currentTimeMillis();`
`2150`	`2152`	`long timeToJob = _jobExecTime.getTimeInMillis() - now;`
`2151`		`- long timeSinceJob = 0;`
	`2153`	`+ long timeSinceLastSuccessJob = 0;`
`2152`	`2154`	`long aggregationDurationMillis = _aggregationDuration * 60L * 1000L;`
`2153`	`2155`	`long lastSuccess = _usageJobDao.getLastJobSuccessDateMillis();`
`2154`	`2156`	`if (lastSuccess > 0) {`
`2155`		`- timeSinceJob = now - lastSuccess;`
	`2157`	`+ timeSinceLastSuccessJob = now - lastSuccess;`
`2156`	`2158`	`}`
`2157`	`2159`
`2158`		`- if ((timeSinceJob > 0) && (timeSinceJob > (aggregationDurationMillis - 100))) {`
	`2160`	`+ if ((timeSinceLastSuccessJob > 0) && (timeSinceLastSuccessJob > (aggregationDurationMillis - 100))) {`
`2159`	`2161`	`if (timeToJob > (aggregationDurationMillis / 2)) {`
`2160`		`- if (logger.isDebugEnabled()) {`
`2161`		`- logger.debug("it's been " + timeSinceJob + " ms since last usage job and " + timeToJob +`
`2162`		`- " ms until next job, scheduling an immediate job to catch up (aggregation duration is " + _aggregationDuration + " minutes)");`
`2163`		`- }`
	`2162`	`+ 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)"`
	`2163`	`+ , timeSinceLastSuccessJob, timeToJob, _aggregationDuration);`
`2164`	`2164`	`scheduleParse();`
`2165`	`2165`	`}`
`2166`	`2166`	`}`
`@@ -2245,17 +2245,12 @@ protected void runInContext() {`
`2245`	`2245`	`}`
`2246`	`2246`	`}`
`2247`	`2247`	`}`
	`2248`	`+`
`2248`	`2249`	`private class AbandonJob extends Thread {`
`2249`	`2250`	`@Override`
`2250`	`2251`	`public void run() {`
`2251`		`- logger.info("exitting Usage Manager");`
`2252`		`- deleteOpenjob();`
`2253`		`- }`
`2254`		`- private void deleteOpenjob() {`
`2255`		`- UsageJobVO job = _usageJobDao.isOwner(_hostname, _pid);`
`2256`		`- if (job != null) {`
`2257`		`- _usageJobDao.remove(job.getId());`
`2258`		`- }`
	`2252`	`+ logger.info("exiting Usage Manager");`
	`2253`	`+ _usageJobDao.removeLastOpenJobsOwned(_hostname, _pid);`
`2259`	`2254`	`}`
`2260`	`2255`	`}`
`2261`	`2256`	`}`