apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4109: fix upload volume to s3 for vmware

Browse Source
This commit is contained in:
Edison Su 2013-08-07 18:25:28 -07:00
parent 82c35e52ea
commit e851f4a930
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
View File

@ -204,7 +204,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
}
return answer;
} catch (Exception e) {
s_logger.debug("copy object failed: " + e.toString());
s_logger.debug("copy object failed: ", e);
if (cacheData != null) {
cacheMgr.deleteCacheObject(cacheData);
}

8
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
View File

@ -502,7 +502,9 @@ public class VolumeObject implements VolumeInfo {
this.getId());
VolumeObjectTO newVol = (VolumeObjectTO) cpyAnswer.getNewData();
volStore.setInstallPath(newVol.getPath());
volStore.setSize(newVol.getSize());
if (newVol.getSize() != null) {
volStore.setSize(newVol.getSize());
}
this.volumeStoreDao.update(volStore.getId(), volStore);
}
}
@ -595,7 +597,9 @@ public class VolumeObject implements VolumeInfo {
this.getId());
VolumeObjectTO newVol = (VolumeObjectTO) cpyAnswer.getNewData();
volStore.setInstallPath(newVol.getPath());
volStore.setSize(newVol.getSize());
if (newVol.getSize() != null) {
volStore.setSize(newVol.getSize());
}
this.volumeStoreDao.update(volStore.getId(), volStore);
}
}

12
plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java
View File

@ -30,6 +30,7 @@ import com.cloud.storage.DataStoreRole;
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.to.SnapshotObjectTO;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import java.io.File;
@ -76,6 +77,17 @@ public class VmwareStorageSubsystemCommandHandler extends StorageSubsystemComman
}
if (srcDataStore.getRole() == DataStoreRole.ImageCache && destDataStore.getRole() == DataStoreRole.Image) {
//need to take extra processing for vmware, such as packing to ova, before sending to S3
if (srcData.getObjectType() == DataObjectType.VOLUME) {
NfsTO cacheStore = (NfsTO)srcDataStore;
String parentPath = storageResource.getRootDir(cacheStore.getUrl());
VolumeObjectTO vol = (VolumeObjectTO)srcData;
String path = vol.getPath();
int index = path.lastIndexOf(File.separator);
String name = path.substring(index + 1);
storageManager.createOva(parentPath + File.separator + path, name);
vol.setPath(path + File.separator + name + ".ova");
}
needDelegation = true;
}