address PR comments from @sureshanaparti

Author: Glover, Rene (rg9975)

engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java

@@ -931,18 +931,18 @@ private HostVO getHostOnWhichToExecuteMigrationCommand(VolumeInfo srcVolumeInfo,
 
     private VolumeInfo createTemporaryVolumeCopyOfSnapshotAdaptive(SnapshotInfo snapshotInfo) {
         VolumeInfo tempVolumeInfo = null;
-        VolumeVO volumeVO = null;
+        VolumeVO tempVolumeVO = null;
         try {
-            volumeVO = new VolumeVO(Volume.Type.DATADISK, snapshotInfo.getName() + "_" + System.currentTimeMillis() + ".TMP",
+            tempVolumeVO = new VolumeVO(Volume.Type.DATADISK, snapshotInfo.getName() + "_" + System.currentTimeMillis() + ".TMP",
                 snapshotInfo.getDataCenterId(), snapshotInfo.getDomainId(), snapshotInfo.getAccountId(), 0, ProvisioningType.THIN, snapshotInfo.getSize(), 0L, 0L, "");
-                volumeVO.setPoolId(snapshotInfo.getDataStore().getId());
-            _volumeDao.persist(volumeVO);
-            tempVolumeInfo = this._volFactory.getVolume(volumeVO.getId());
+                tempVolumeVO.setPoolId(snapshotInfo.getDataStore().getId());
+            _volumeDao.persist(tempVolumeVO);
+            tempVolumeInfo = this._volFactory.getVolume(tempVolumeVO.getId());
 
             if (snapshotInfo.getDataStore().getDriver().canCopy(snapshotInfo, tempVolumeInfo)) {
                 snapshotInfo.getDataStore().getDriver().copyAsync(snapshotInfo, tempVolumeInfo, null, null);
                 // refresh volume info as data could have changed
-                tempVolumeInfo = this._volFactory.getVolume(volumeVO.getId());
+                tempVolumeInfo = this._volFactory.getVolume(tempVolumeVO.getId());
             } else {
                 throw new CloudRuntimeException("Storage driver indicated it could create a volume from the snapshot but rejected the subsequent request to do so");
             }
@@ -954,8 +954,8 @@ private VolumeInfo createTemporaryVolumeCopyOfSnapshotAdaptive(SnapshotInfo snap
                 }
 
                 // cleanup temporary volume
-                if (volumeVO != null) {
-                    _volumeDao.remove(volumeVO.getId());
+                if (tempVolumeVO != null) {
+                    _volumeDao.remove(tempVolumeVO.getId());
                 }
             } catch (Throwable e2) {
                 LOGGER.warn("Failed to delete temporary volume created for copy", e2);

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/FiberChannelAdapter.java

@@ -41,9 +41,6 @@ public FiberChannelAdapter() {
             if (hostname.indexOf(".") > 0) {
                 hostname = hostname.substring(0, hostname.indexOf(".")); // strip off domain
             }
-            if (hostname.indexOf(".") > 0) {
-                hostname = hostname.substring(0, hostname.indexOf(".")); // strip off domain
-            }
             hostnameFq = inetAddress.getCanonicalHostName(); // fully qualified hostname
             LOGGER.info("Loaded FiberChannelAdapter for StorageLayer on host [" + hostname + "]");
         } catch (UnknownHostException e) {

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java

@@ -364,14 +364,6 @@ public KVMPhysicalDisk copyPhysicalDisk(KVMPhysicalDisk disk, String name, KVMSt
         LOGGER.debug("Starting COPY from source path " + srcFile.getFileName() + " to target volume path: " + destDisk.getPath());
 
         ScriptResult result = runScript(copyScript, timeout, destDisk.getFormat().toString().toLowerCase(), srcFile.getFileName(), destFile.getFileName());
-        /**Script script = new Script(
-            String.format("%s %s %s %s", copyScript, destDisk.getFormat().toString().toLowerCase(), srcFile.getFileName(), destFile.getFileName()),
-            Duration.millis(timeout),
-            LOGGER);
-
-        script.execute();
-        int rc = script.getExitValue();
-        */
         int rc = result.getExitCode();
         if (rc != 0) {
             throw new CloudRuntimeException("Failed to convert from " + srcFile.getFileName() + " to " + destFile.getFileName() + " the error was: " + rc + " - " + result.getResult());