Skip to content

Commit 99dcb23

Browse files
sudisonsudison
committed
fix build
1 parent 2f68917 commit 99dcb23

5 files changed

Lines changed: 13 additions & 19 deletions

File tree

‎plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,12 @@ private void deleteSnapshot(DataObject data, AsyncCompletionCallback<CommandResu
335335
}
336336

337337
try {
338-
String secondaryStoragePoolUrl = secStore.getUri();
338+
/*String secondaryStoragePoolUrl = secStore.getUri();
339339
Long dcId = snapshot.getDataCenterId();
340340
Long accountId = snapshot.getAccountId();
341341
Long volumeId = snapshot.getVolumeId();
342342
343-
String backupOfSnapshot = snapshotObj.getBackupSnapshotId();
343+
String backupOfSnapshot = snapshotObj;
344344
if (backupOfSnapshot == null) {
345345
callback.complete(result);
346346
return;
@@ -357,7 +357,7 @@ private void deleteSnapshot(DataObject data, AsyncCompletionCallback<CommandResu
357357
snapshotDao.update(snapshotObj.getId(), snapshot);
358358
} else if (answer != null) {
359359
result.setResult(answer.getDetails());
360-
}
360+
}*/
361361
} catch (Exception e) {
362362
s_logger.debug("failed to delete snapshot: " + snapshotObj.getId() + ": " + e.toString());
363363
result.setResult(e.toString());

‎plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ private void deleteSnapshot(DataObject data, AsyncCompletionCallback<CommandResu
298298
Long accountId = snapshot.getAccountId();
299299
Long volumeId = snapshot.getVolumeId();
300300

301-
String backupOfSnapshot = snapshotObj.getBackupSnapshotId();
301+
String backupOfSnapshot = snapshotObj.getPath();
302302
if (backupOfSnapshot == null) {
303303
callback.complete(result);
304304
return;
@@ -310,10 +310,7 @@ private void deleteSnapshot(DataObject data, AsyncCompletionCallback<CommandResu
310310
EndPoint ep = _epSelector.select(secStore);
311311
Answer answer = ep.sendMessage(cmd);
312312

313-
if ((answer != null) && answer.getResult()) {
314-
snapshot.setBackupSnapshotId(null);
315-
snapshotDao.update(snapshotObj.getId(), snapshot);
316-
} else if (answer != null) {
313+
if (answer != null) {
317314
result.setResult(answer.getDetails());
318315
}
319316
} catch (Exception e) {

‎plugins/storage/image/swift/src/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ private void deleteSnapshot(DataObject data, AsyncCompletionCallback<CommandResu
292292
Long accountId = snapshot.getAccountId();
293293
Long volumeId = snapshot.getVolumeId();
294294

295-
String backupOfSnapshot = snapshotObj.getBackupSnapshotId();
295+
String backupOfSnapshot = snapshotObj.getPath();
296296
if (backupOfSnapshot == null) {
297297
callback.complete(result);
298298
return;
@@ -304,10 +304,7 @@ private void deleteSnapshot(DataObject data, AsyncCompletionCallback<CommandResu
304304
EndPoint ep = _epSelector.select(secStore);
305305
Answer answer = ep.sendMessage(cmd);
306306

307-
if ((answer != null) && answer.getResult()) {
308-
snapshot.setBackupSnapshotId(null);
309-
snapshotDao.update(snapshotObj.getId(), snapshot);
310-
} else if (answer != null) {
307+
if (answer != null) {
311308
result.setResult(answer.getDetails());
312309
}
313310
} catch (Exception e) {

‎plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public DataObject getVolume() {
9090
}
9191

9292
public Void createAsyncCallback(AsyncCallbackDispatcher<SamplePrimaryDataStoreDriverImpl, Answer> callback, CreateVolumeContext<CreateCmdResult> context) {
93-
CreateCmdResult result = null;
93+
/*CreateCmdResult result = null;
9494
CreateObjectAnswer volAnswer = (CreateObjectAnswer) callback.getResult();
9595
if (volAnswer.getResult()) {
9696
result = new CreateCmdResult(volAnswer.getPath(), volAnswer);
@@ -99,7 +99,7 @@ public Void createAsyncCallback(AsyncCallbackDispatcher<SamplePrimaryDataStoreDr
9999
result.setResult(volAnswer.getDetails());
100100
}
101101
102-
context.getParentCallback().complete(result);
102+
context.getParentCallback().complete(result);*/
103103
return null;
104104
}
105105

@@ -177,7 +177,7 @@ public Object createVolumeFromBaseImageAsyncCallback(AsyncCallbackDispatcher<Def
177177
public void createAsync(DataObject vol,
178178
AsyncCompletionCallback<CreateCmdResult> callback) {
179179
EndPoint ep = selector.select(vol);
180-
CreateObjectCommand createCmd = new CreateObjectCommand(vol.getUri());
180+
CreateObjectCommand createCmd = new CreateObjectCommand(null);
181181

182182
CreateVolumeContext<CreateCmdResult> context = new CreateVolumeContext<CreateCmdResult>(callback, vol);
183183
AsyncCallbackDispatcher<SamplePrimaryDataStoreDriverImpl, Answer> caller = AsyncCallbackDispatcher.create(this);
@@ -197,10 +197,10 @@ public String grantAccess(DataObject object, EndPoint ep) {
197197
if (obj.getPath() == null) {
198198
//create an obj
199199
EndPoint newEp = selector.select(object);
200-
CreateObjectCommand createCmd = new CreateObjectCommand(uri);
200+
CreateObjectCommand createCmd = new CreateObjectCommand(null);
201201
CreateObjectAnswer answer = (CreateObjectAnswer)ep.sendMessage(createCmd);
202202
if (answer.getResult()) {
203-
dataObjMgr.update(object, answer.getPath(), answer.getSize());
203+
//dataObjMgr.update(object, answer.getPath(), answer.getSize());
204204
} else {
205205
s_logger.debug("failed to create object" + answer.getDetails());
206206
throw new CloudRuntimeException("failed to create object" + answer.getDetails());

‎plugins/storage/volume/solidfire/test/org/apache/cloudstack/storage/test/VolumeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void setUp() {
109109
results.add(host);
110110
Mockito.when(hostDao.listAll()).thenReturn(results);
111111
Mockito.when(hostDao.findHypervisorHostInCluster(Mockito.anyLong())).thenReturn(results);
112-
CreateObjectAnswer createVolumeFromImageAnswer = new CreateObjectAnswer(null,UUID.randomUUID().toString(), null);
112+
//CreateObjectAnswer createVolumeFromImageAnswer = new CreateObjectAnswer(null,UUID.randomUUID().toString(), null);
113113

114114

115115

0 commit comments

Comments
 (0)