Merge branch '4.19'

Author: vishesh92

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -519,17 +519,17 @@ public synchronized void registerStatusUpdater(AgentStatusUpdater updater) {
             try {
                 Connect conn = LibvirtConnection.getConnection();
                 if (libvirtDomainListener != null) {
-                    s_logger.debug("Clearing old domain listener");
+                    LOGGER.debug("Clearing old domain listener");
                     conn.removeLifecycleListener(libvirtDomainListener);
                 }
                 libvirtDomainListener = new LibvirtDomainListener(updater);
                 conn.addLifecycleListener(libvirtDomainListener);
-                s_logger.debug("Set up the libvirt domain event lifecycle listener");
+                LOGGER.debug("Set up the libvirt domain event lifecycle listener");
             } catch (LibvirtException e) {
-                s_logger.error("Failed to get libvirt connection for domain event lifecycle", e);
+                LOGGER.error("Failed to get libvirt connection for domain event lifecycle", e);
             }
         } else {
-            s_logger.debug("Libvirt event listening is disabled, not registering status updater");
+            LOGGER.debug("Libvirt event listening is disabled, not registering status updater");
         }
     }
     @Inject
@@ -2028,7 +2028,7 @@ public boolean stop() {
         try {
             final Connect conn = LibvirtConnection.getConnection();
             if (AgentPropertiesFileHandler.getPropertyValue(AgentProperties.LIBVIRT_EVENTS_ENABLED) && libvirtDomainListener != null) {
-                s_logger.debug("Clearing old domain listener");
+                LOGGER.debug("Clearing old domain listener");
                 conn.removeLifecycleListener(libvirtDomainListener);
             }
             conn.close();

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java

@@ -123,7 +123,7 @@ static String getHypervisorURI(String hypervisorType) {
      */
     private static synchronized void setupEventListener() throws LibvirtException {
         if (!AgentPropertiesFileHandler.getPropertyValue(AgentProperties.LIBVIRT_EVENTS_ENABLED)) {
-            s_logger.debug("Libvirt event listening is disabled, not setting up event loop");
+            LOGGER.debug("Libvirt event listening is disabled, not setting up event loop");
             return;
         }
 

plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java

@@ -812,7 +812,7 @@ private Answer copyTemplateToVolume(DataObject srcData, DataObject destData, Hos
                 setVolumeLimitsOnSDC(volume, host, destData.getDataStore(), 0L, 0L);
                 answer = ep.sendMessage(cmd);
             } catch (Exception e) {
-                LOGGER.error("Failed to copy template to volume due to: " + e.getMessage(), e);
+                logger.error("Failed to copy template to volume due to: " + e.getMessage(), e);
                 answer = new Answer(cmd, false, e.getMessage());
             }
         }