Merge release branch 4.18 to 4.19

* 4.18:
  protect against null-path (#8915)
  UI: Fix missing locale strings for Status widget (#8792)
  Add a shutdownhook to remove jobs owned by the process (#8896)

Author: DaanHoogland

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

@@ -3071,7 +3071,10 @@ protected void setVAppPropertiesToConfigSpec(VmConfigInfo vAppConfig,
     }
 
     private String appendFileType(String path, String fileType) {
-        if (path.toLowerCase().endsWith(fileType.toLowerCase())) {
+        if (StringUtils.isBlank(path)) {
+            throw new CloudRuntimeException("No path given, cannot append filetype " + fileType);
+        }
+        if (fileType == null || path.toLowerCase().endsWith(fileType.toLowerCase())) {
             return path;
         }
 

systemvm/debian/etc/logrotate.d/haproxy

@@ -4,6 +4,6 @@
     notifempty
     maxsize 10M
     postrotate
-      /bin/kill -HUP `cat /var/run/rsyslog.pid 2> /dev/null` 2> /dev/null || true
+      /usr/lib/rsyslog/rsyslog-rotate
     endscript
 }

ui/src/components/widgets/Status.vue

@@ -168,23 +168,24 @@ export default {
       if (!(state && this.displayText)) {
         return ''
       }
+      let result
       if (this.$route.path === '/vmsnapshot' || this.$route.path.includes('/vmsnapshot/')) {
-        return this.$t('message.vmsnapshot.state.' + state.toLowerCase())
+        result = this.$t('message.vmsnapshot.state.' + state.toLowerCase())
+      } else if (this.$route.path === '/vm' || this.$route.path.includes('/vm/')) {
+        result = this.$t('message.vm.state.' + state.toLowerCase())
+      } else if (this.$route.path === '/volume' || this.$route.path.includes('/volume/')) {
+        result = this.$t('message.volume.state.' + state.toLowerCase())
+      } else if (this.$route.path === '/guestnetwork' || this.$route.path.includes('/guestnetwork/')) {
+        result = this.$t('message.guestnetwork.state.' + state.toLowerCase())
+      } else if (this.$route.path === '/publicip' || this.$route.path.includes('/publicip/')) {
+        result = this.$t('message.publicip.state.' + state.toLowerCase())
       }
-      if (this.$route.path === '/vm' || this.$route.path.includes('/vm/')) {
-        return this.$t('message.vm.state.' + state.toLowerCase())
-      }
-      if (this.$route.path === '/volume' || this.$route.path.includes('/volume/')) {
-        return this.$t('message.volume.state.' + state.toLowerCase())
-      }
-      if (this.$route.path === '/guestnetwork' || this.$route.path.includes('/guestnetwork/')) {
-        return this.$t('message.guestnetwork.state.' + state.toLowerCase())
-      }
-      if (this.$route.path === '/publicip' || this.$route.path.includes('/publicip/')) {
-        return this.$t('message.publicip.state.' + state.toLowerCase())
+
+      if (!result || (result.startsWith('message.') && result.endsWith('.state.' + state.toLowerCase()))) {
+        // Nothing for snapshots, vpcs, gateways, vnpnconn, vpnuser, kubectl, event, project, account, infra. They're all self explanatory
+        result = this.$t(state)
       }
-      // Nothing for snapshots, vpcs, gateways, vnpnconn, vpnuser, kubectl, event, project, account, infra. They're all self explanatory
-      return this.$t(state)
+      return result
     },
     getStyle () {
       let styles = { display: 'inline-flex' }

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

@@ -321,6 +321,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
@@ -350,9 +351,11 @@ public boolean stop() {
         if (_sanity != null) {
             _sanity.cancel(true);
         }
+
         return true;
     }
 
+
     @Override
     public void run() {
         (new ManagedContextRunnable() {
@@ -2235,4 +2238,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());
+            }
+        }
+    }
 }