From 73c57bf0b296c22253134b1cdb2de7bfd09b2fea Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Mon, 12 Aug 2013 11:26:22 -0700
Subject: [PATCH] CLOUDSTACK-4253: add more logs for vmware storage related
 operations

---
 .../resource/VmwareStorageProcessor.java      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index 8f8e0c75f11..39368cc2688 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import com.cloud.utils.exception.ExceptionUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
@@ -233,7 +234,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
                 hostService.invalidateServiceContext(context);
             }
 
-            String msg = "Unable to copy template to primary storage due to exception:" + e.toString();
+            String msg = "Unable to copy template to primary storage due to exception:" + VmwareHelper.getExceptionMessage(e);
             s_logger.error(msg, e);
             return new CopyCmdAnswer(msg);
         }
@@ -405,7 +406,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
                 hostService.invalidateServiceContext(null);
             }
 
-            String msg = "CopyCommand failed due to " + VmwareHelper.getExceptionMessage(e);
+            String msg = "clone volume from base image failed due to " + VmwareHelper.getExceptionMessage(e);
             s_logger.error(msg, e);
             return new CopyCmdAnswer(e.toString());
         }
@@ -488,7 +489,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
 
             String msg = "Unable to execute CopyVolumeCommand due to exception";
             s_logger.error(msg, t);
-            return new CopyCmdAnswer("CopyVolumeCommand failed due to exception: " + t.toString());
+            return new CopyCmdAnswer("copy volume secondary to primary failed due to exception: " + VmwareHelper.getExceptionMessage(t));
         }
 
     }
@@ -577,7 +578,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
 
             String msg = "Unable to execute CopyVolumeCommand due to exception";
             s_logger.error(msg, e);
-            return new CopyCmdAnswer("CopyVolumeCommand failed due to exception: " + e.toString());
+            return new CopyCmdAnswer("copy volume from primary to secondary failed due to exception: " + VmwareHelper.getExceptionMessage(e));
         }
     }
 
@@ -746,7 +747,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
 
             s_logger.error("Unexpecpted exception ", e);
 
-            details = "CreatePrivateTemplateFromVolumeCommand exception: " + e.toString();
+            details = "create template from volume exception: " + VmwareHelper.getExceptionMessage(e);
             return new CopyCmdAnswer(details);
         }
     }
@@ -942,7 +943,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
 
             s_logger.error("Unexpecpted exception ", e);
 
-            details = "CreatePrivateTemplateFromSnapshotCommand exception: " + e.toString();
+            details = "create template from snapshot exception: " + VmwareHelper.getExceptionMessage(e);
             return new CopyCmdAnswer(details);
         }
     }
@@ -1110,7 +1111,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
 
             s_logger.error("Unexpecpted exception ", e);
 
-            details = "BackupSnapshotCommand exception: " + e.toString();
+            details = "backup snapshot exception: " + VmwareHelper.getExceptionMessage(e);
             return new CopyCmdAnswer(details);
         }
     }
@@ -1369,7 +1370,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
                 hostService.invalidateServiceContext(null);
             }
 
-            String msg = "CreateCommand failed due to " + VmwareHelper.getExceptionMessage(e);
+            String msg = "create volume failed due to " + VmwareHelper.getExceptionMessage(e);
             s_logger.error(msg, e);
             return new CreateObjectAnswer(e.toString());
         }
@@ -1483,7 +1484,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
                 hostService.invalidateServiceContext(null);
             }
 
-            String msg = "DestroyCommand failed due to " + VmwareHelper.getExceptionMessage(e);
+            String msg = "delete volume failed due to " + VmwareHelper.getExceptionMessage(e);
             s_logger.error(msg, e);
             return new Answer(cmd, false, msg);
         }
@@ -1608,7 +1609,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
             }
 
             s_logger.error("Unexpecpted exception ", e);
-            details = "CreateVolumeFromSnapshotCommand exception: " + e.toString();
+            details = "create volume from snapshot exception: " + VmwareHelper.getExceptionMessage(e);
         }
         return new CopyCmdAnswer(details);
     }