etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

volume upload: returning the install path and size in UploadStatusCommand

This commit is contained in:
Rajani Karuturi 2015-01-31 16:20:29 +05:30
parent 121ff19cba
commit 01c41d09db
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View File

@ -1725,11 +1725,15 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
if (uploadEntityStateMap.containsKey(entityId)) {
UploadEntity uploadEntity = uploadEntityStateMap.get(entityId);
if (uploadEntity.getUploadState()== UploadEntity.Status.ERROR) {
uploadEntityStateMap.remove(uploadEntity);
uploadEntityStateMap.remove(entityId);
return new UploadStatusAnswer(cmd, UploadStatus.ERROR, uploadEntity.getErrorMessage());
}else if (uploadEntity.getUploadState()== UploadEntity.Status.COMPLETED) {
uploadEntityStateMap.remove(uploadEntity);
return new UploadStatusAnswer(cmd, UploadStatus.COMPLETED);
UploadStatusAnswer answer = new UploadStatusAnswer(cmd, UploadStatus.COMPLETED);
answer.setVirtualSize(uploadEntity.getVirtualSize());
answer.setInstallPath(uploadEntity.getTmpltPath());
answer.setPhysicalSize(uploadEntity.getEntitysize());
uploadEntityStateMap.remove(entityId);
return answer;
}else if (uploadEntity.getUploadState()==UploadEntity.Status.IN_PROGRESS) {
return new UploadStatusAnswer(cmd,UploadStatus.IN_PROGRESS);
}
@ -2833,6 +2837,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
}
if (info != null) {
loc.addFormat(info);
uploadEntity.setVirtualSize(info.virtualSize);
//dnld.setTemplatesize(info.virtualSize);
//dnld.setTemplatePhysicalSize(info.size);
break;

8
services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadEntity.java
View File

@ -49,6 +49,7 @@ public class UploadEntity {
private String errorMessage=null;
private File file;
private ResourceType resourceType;
private long virtualSize;
public static long s_maxTemplateSize = 50L * 1024L * 1024L * 1024L;
@ -173,4 +174,11 @@ public class UploadEntity {
this.chksum = chksum;
}
public long getVirtualSize() {
return virtualSize;
}
public void setVirtualSize(long virtualSize) {
this.virtualSize = virtualSize;
}
}