npe investigative log

Author: DaanHoogland

core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java

@@ -18,6 +18,8 @@
 
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.to.DataTO;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 public final class CreateDatadiskTemplateCommand extends Command {
     private DataTO dataDiskTemplate;
@@ -68,4 +70,8 @@ public void setDiskId(String diskId) {
         this.diskId = diskId;
     }
 
+    public String stringRepresentation() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
+    }
+
 }

services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java

@@ -24,7 +24,6 @@
 import static com.cloud.network.NetworkModel.USERDATA_FILE;
 import static com.cloud.utils.StringUtils.join;
 import static com.cloud.utils.storage.S3.S3Utils.putFile;
-import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static org.apache.commons.lang.StringUtils.substringAfterLast;
 
@@ -475,6 +474,9 @@ public Answer execute(CreateDatadiskTemplateCommand cmd) {
 
             long templateId = dataDiskTemplate.getId();
             String templateUniqueName = dataDiskTemplate.getUniqueName();
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug(String.format("no cmd? %s", cmd.stringRepresentation()));
+            }
             String origDisk = cmd.getPath();
             long virtualSize = dataDiskTemplate.getSize();
             String diskName = origDisk.substring((origDisk.lastIndexOf(File.separator)) + 1);
@@ -804,7 +806,7 @@ protected Answer copyFromS3ToNfs(CopyCommand cmd, DataTO srcData, S3TO s3, DataT
             return postProcessing(destFile, downloadPath, destPath, srcData, destData);
         } catch (Exception e) {
 
-            final String errMsg = format("Failed to download" + "due to $1%s", e.getMessage());
+            final String errMsg = String.format("Failed to download" + "due to $1%s", e.getMessage());
             s_logger.error(errMsg, e);
             return new CopyCmdAnswer(errMsg);
         }