Skip to content

Commit 662e636

Browse files
committed
addressed comments
1 parent 3bc5a0e commit 662e636

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
@@ -378,7 +378,7 @@ public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> cal
378378
VolumeObject vol = (VolumeObject)data;
379379
path = vol.getPath();
380380

381-
err = resizeVolume(data, path, err, vol);
381+
err = resizeVolume(data, path, vol);
382382
} else {
383383
err = String.format("Invalid object type \"%s\" passed to resize", data.getType());
384384
}
@@ -388,7 +388,8 @@ public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> cal
388388
callback.complete(res);
389389
}
390390

391-
private String resizeVolume(DataObject data, String path, String err, VolumeObject vol) {
391+
private String resizeVolume(DataObject data, String path, VolumeObject vol) {
392+
String err = null;
392393
ResizeVolumePayload payload = (ResizeVolumePayload)vol.getpayload();
393394
boolean needResize = vol.getSize() != payload.newSize;
394395

@@ -399,7 +400,7 @@ private String resizeVolume(DataObject data, String path, String err, VolumeObje
399400
try {
400401
SpConnectionDesc conn = StorPoolUtil.getSpConnection(data.getDataStore().getUuid(), data.getDataStore().getId(), storagePoolDetailsDao, primaryStoreDao);
401402

402-
err = updateStorPoolVolume(err, vol, payload, conn);
403+
err = updateStorPoolVolume(vol, payload, conn);
403404
if (err == null && needResize) {
404405
err = notifyQemuForTheNewSize(data, err, vol, payload);
405406
}
@@ -432,7 +433,8 @@ private String notifyQemuForTheNewSize(DataObject data, String err, VolumeObject
432433
return err;
433434
}
434435

435-
private String updateStorPoolVolume(String err, VolumeObject vol, ResizeVolumePayload payload, SpConnectionDesc conn) {
436+
private String updateStorPoolVolume(VolumeObject vol, ResizeVolumePayload payload, SpConnectionDesc conn) {
437+
String err = null;
436438
String name = StorPoolStorageAdaptor.getVolumeNameFromPath(vol.getPath(), true);
437439
Long newDiskOfferingId = payload.getNewDiskOfferingId();
438440
String tier = null;

0 commit comments

Comments
 (0)