Skip to content

Commit 9ab0f18

Browse files
committed
addressed comments
1 parent 3e58e81 commit 9ab0f18

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> cal
386386
VolumeObject vol = (VolumeObject)data;
387387
path = vol.getPath();
388388

389-
err = resizeVolume(data, path, err, vol);
389+
err = resizeVolume(data, path, vol);
390390
} else {
391391
err = String.format("Invalid object type \"%s\" passed to resize", data.getType());
392392
}
@@ -396,7 +396,8 @@ public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> cal
396396
callback.complete(res);
397397
}
398398

399-
private String resizeVolume(DataObject data, String path, String err, VolumeObject vol) {
399+
private String resizeVolume(DataObject data, String path, VolumeObject vol) {
400+
String err = null;
400401
ResizeVolumePayload payload = (ResizeVolumePayload)vol.getpayload();
401402
boolean needResize = vol.getSize() != payload.newSize;
402403

@@ -407,7 +408,7 @@ private String resizeVolume(DataObject data, String path, String err, VolumeObje
407408
try {
408409
SpConnectionDesc conn = StorPoolUtil.getSpConnection(data.getDataStore().getUuid(), data.getDataStore().getId(), storagePoolDetailsDao, primaryStoreDao);
409410

410-
err = updateStorPoolVolume(err, vol, payload, conn);
411+
err = updateStorPoolVolume(vol, payload, conn);
411412
if (err == null && needResize) {
412413
err = notifyQemuForTheNewSize(data, err, vol, payload);
413414
}
@@ -440,7 +441,8 @@ private String notifyQemuForTheNewSize(DataObject data, String err, VolumeObject
440441
return err;
441442
}
442443

443-
private String updateStorPoolVolume(String err, VolumeObject vol, ResizeVolumePayload payload, SpConnectionDesc conn) {
444+
private String updateStorPoolVolume(VolumeObject vol, ResizeVolumePayload payload, SpConnectionDesc conn) {
445+
String err = null;
444446
String name = StorPoolStorageAdaptor.getVolumeNameFromPath(vol.getPath(), true);
445447
Long newDiskOfferingId = payload.getNewDiskOfferingId();
446448
String tier = null;

0 commit comments

Comments
 (0)