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

fix build

Browse Source
This commit is contained in:
Edison Su 2013-04-29 19:37:47 -07:00
parent 2f689171e0
commit 99dcb23b1c
5 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
View File

@ -335,12 +335,12 @@ public class CloudStackImageStoreDriverImpl implements ImageStoreDriver {
} }
try { try {
String secondaryStoragePoolUrl = secStore.getUri(); /*String secondaryStoragePoolUrl = secStore.getUri();
Long dcId = snapshot.getDataCenterId(); Long dcId = snapshot.getDataCenterId();
Long accountId = snapshot.getAccountId(); Long accountId = snapshot.getAccountId();
Long volumeId = snapshot.getVolumeId(); Long volumeId = snapshot.getVolumeId();
String backupOfSnapshot = snapshotObj.getBackupSnapshotId(); String backupOfSnapshot = snapshotObj;
if (backupOfSnapshot == null) { if (backupOfSnapshot == null) {
callback.complete(result); callback.complete(result);
return; return;
@ -357,7 +357,7 @@ public class CloudStackImageStoreDriverImpl implements ImageStoreDriver {
snapshotDao.update(snapshotObj.getId(), snapshot); snapshotDao.update(snapshotObj.getId(), snapshot);
} else if (answer != null) { } else if (answer != null) {
result.setResult(answer.getDetails()); result.setResult(answer.getDetails());
} }*/
} catch (Exception e) { } catch (Exception e) {
s_logger.debug("failed to delete snapshot: " + snapshotObj.getId() + ": " + e.toString()); s_logger.debug("failed to delete snapshot: " + snapshotObj.getId() + ": " + e.toString());
result.setResult(e.toString()); result.setResult(e.toString());

7
plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java
View File

@ -298,7 +298,7 @@ public class S3ImageStoreDriverImpl implements ImageStoreDriver {
Long accountId = snapshot.getAccountId(); Long accountId = snapshot.getAccountId();
Long volumeId = snapshot.getVolumeId(); Long volumeId = snapshot.getVolumeId();
String backupOfSnapshot = snapshotObj.getBackupSnapshotId(); String backupOfSnapshot = snapshotObj.getPath();
if (backupOfSnapshot == null) { if (backupOfSnapshot == null) {
callback.complete(result); callback.complete(result);
return; return;
@ -310,10 +310,7 @@ public class S3ImageStoreDriverImpl implements ImageStoreDriver {
EndPoint ep = _epSelector.select(secStore); EndPoint ep = _epSelector.select(secStore);
Answer answer = ep.sendMessage(cmd); Answer answer = ep.sendMessage(cmd);
if ((answer != null) && answer.getResult()) { if (answer != null) {
snapshot.setBackupSnapshotId(null);
snapshotDao.update(snapshotObj.getId(), snapshot);
} else if (answer != null) {
result.setResult(answer.getDetails()); result.setResult(answer.getDetails());
} }
} catch (Exception e) { } catch (Exception e) {

7
plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java
View File

@ -292,7 +292,7 @@ public class SwiftImageStoreDriverImpl implements ImageStoreDriver {
Long accountId = snapshot.getAccountId(); Long accountId = snapshot.getAccountId();
Long volumeId = snapshot.getVolumeId(); Long volumeId = snapshot.getVolumeId();
String backupOfSnapshot = snapshotObj.getBackupSnapshotId(); String backupOfSnapshot = snapshotObj.getPath();
if (backupOfSnapshot == null) { if (backupOfSnapshot == null) {
callback.complete(result); callback.complete(result);
return; return;
@ -304,10 +304,7 @@ public class SwiftImageStoreDriverImpl implements ImageStoreDriver {
EndPoint ep = _epSelector.select(secStore); EndPoint ep = _epSelector.select(secStore);
Answer answer = ep.sendMessage(cmd); Answer answer = ep.sendMessage(cmd);
if ((answer != null) && answer.getResult()) { if (answer != null) {
snapshot.setBackupSnapshotId(null);
snapshotDao.update(snapshotObj.getId(), snapshot);
} else if (answer != null) {
result.setResult(answer.getDetails()); result.setResult(answer.getDetails());
} }
} catch (Exception e) { } catch (Exception e) {

10
plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java
View File

@ -90,7 +90,7 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver
} }
public Void createAsyncCallback(AsyncCallbackDispatcher<SamplePrimaryDataStoreDriverImpl, Answer> callback, CreateVolumeContext<CreateCmdResult> context) { public Void createAsyncCallback(AsyncCallbackDispatcher<SamplePrimaryDataStoreDriverImpl, Answer> callback, CreateVolumeContext<CreateCmdResult> context) {
CreateCmdResult result = null; /*CreateCmdResult result = null;
CreateObjectAnswer volAnswer = (CreateObjectAnswer) callback.getResult(); CreateObjectAnswer volAnswer = (CreateObjectAnswer) callback.getResult();
if (volAnswer.getResult()) { if (volAnswer.getResult()) {
result = new CreateCmdResult(volAnswer.getPath(), volAnswer); result = new CreateCmdResult(volAnswer.getPath(), volAnswer);
@ -99,7 +99,7 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver
result.setResult(volAnswer.getDetails()); result.setResult(volAnswer.getDetails());
} }
context.getParentCallback().complete(result); context.getParentCallback().complete(result);*/
return null; return null;
} }
@ -177,7 +177,7 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver
public void createAsync(DataObject vol, public void createAsync(DataObject vol,
AsyncCompletionCallback<CreateCmdResult> callback) { AsyncCompletionCallback<CreateCmdResult> callback) {
EndPoint ep = selector.select(vol); EndPoint ep = selector.select(vol);
CreateObjectCommand createCmd = new CreateObjectCommand(vol.getUri()); CreateObjectCommand createCmd = new CreateObjectCommand(null);
CreateVolumeContext<CreateCmdResult> context = new CreateVolumeContext<CreateCmdResult>(callback, vol); CreateVolumeContext<CreateCmdResult> context = new CreateVolumeContext<CreateCmdResult>(callback, vol);
AsyncCallbackDispatcher<SamplePrimaryDataStoreDriverImpl, Answer> caller = AsyncCallbackDispatcher.create(this); AsyncCallbackDispatcher<SamplePrimaryDataStoreDriverImpl, Answer> caller = AsyncCallbackDispatcher.create(this);
@ -197,10 +197,10 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver
if (obj.getPath() == null) { if (obj.getPath() == null) {
//create an obj //create an obj
EndPoint newEp = selector.select(object); EndPoint newEp = selector.select(object);
CreateObjectCommand createCmd = new CreateObjectCommand(uri); CreateObjectCommand createCmd = new CreateObjectCommand(null);
CreateObjectAnswer answer = (CreateObjectAnswer)ep.sendMessage(createCmd); CreateObjectAnswer answer = (CreateObjectAnswer)ep.sendMessage(createCmd);
if (answer.getResult()) { if (answer.getResult()) {
dataObjMgr.update(object, answer.getPath(), answer.getSize()); //dataObjMgr.update(object, answer.getPath(), answer.getSize());
} else { } else {
s_logger.debug("failed to create object" + answer.getDetails()); s_logger.debug("failed to create object" + answer.getDetails());
throw new CloudRuntimeException("failed to create object" + answer.getDetails()); throw new CloudRuntimeException("failed to create object" + answer.getDetails());

2
plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java
View File

@ -109,7 +109,7 @@ public class VolumeTest {
results.add(host); results.add(host);
Mockito.when(hostDao.listAll()).thenReturn(results); Mockito.when(hostDao.listAll()).thenReturn(results);
Mockito.when(hostDao.findHypervisorHostInCluster(Mockito.anyLong())).thenReturn(results); Mockito.when(hostDao.findHypervisorHostInCluster(Mockito.anyLong())).thenReturn(results);
CreateObjectAnswer createVolumeFromImageAnswer = new CreateObjectAnswer(null,UUID.randomUUID().toString(), null); //CreateObjectAnswer createVolumeFromImageAnswer = new CreateObjectAnswer(null,UUID.randomUUID().toString(), null);