Merge branch '4.19' into 4.20

Author: Daan Hoogland

engine/schema/src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java

@@ -216,10 +216,10 @@ public void removeLastOpenJobsOwned(String hostname, int pid) {
         try {
             List<UsageJobVO> jobs = getLastOpenJobsOwned(hostname, pid);
             if (CollectionUtils.isNotEmpty(jobs)) {
-                s_logger.info(String.format("Found %s opens job, to remove", jobs.size()));
+                logger.info("Found {} opens job, to remove", jobs.size());
                 for (UsageJobVO job : jobs) {
-                    s_logger.debug(String.format("Removing job - id: %d, pid: %d, job type: %d, scheduled: %d, heartbeat: %s",
-                            job.getId(), job.getPid(), job.getJobType(), job.getScheduled(), job.getHeartbeat()));
+                    logger.debug("Removing job - id: {}, pid: {}, job type: {}, scheduled: {}, heartbeat: {}",
+                            job.getId(), job.getPid(), job.getJobType(), job.getScheduled(), job.getHeartbeat());
                     remove(job.getId());
                 }
             }

usage/src/main/java/com/cloud/usage/UsageManagerImpl.java

@@ -2160,10 +2160,8 @@ protected void runInContext() {
 
                         if ((timeSinceLastSuccessJob > 0) && (timeSinceLastSuccessJob > (aggregationDurationMillis - 100))) {
                             if (timeToJob > (aggregationDurationMillis / 2)) {
-                                if (logger.isDebugEnabled()) {
-                                    logger.debug("it's been " + timeSinceLastSuccessJob + " 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();
                             }
                         }