Skip to content

Commit 2433f7c

Browse files
committed
address reviews
1 parent 92c3486 commit 2433f7c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

core/src/main/java/com/cloud/agent/api/storage/DeleteDiskOnlyVmSnapshotCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ public List<DataTO> getSnapshots() {
3939

4040
@Override
4141
public boolean executeInSequence() {
42-
return true;
42+
return false;
4343
}
4444
}

core/src/main/java/com/cloud/agent/api/storage/MergeDiskOnlyVmSnapshotCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public String getVmName() {
4949

5050
@Override
5151
public boolean executeInSequence() {
52-
return true;
52+
return false;
5353
}
5454

5555
}

core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public String getVmName() {
4444

4545
@Override
4646
public boolean executeInSequence() {
47-
return true;
47+
return false;
4848
}
4949

5050
}

plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -835,17 +835,17 @@ public void resize(final QemuImgFile file, final long size) throws QemuImgExcept
835835
* The file to be commited.
836836
* @param base
837837
* If base is not specified, the immediate backing file of the top image (which is {@code file}) will be used.
838-
* @param deleteFile
839-
* If true, the commited file(s) will be deleted.
838+
* @param skipEmptyingFiles
839+
* If true, the commited file(s) will not be emptied. If base is informed, skipEmptyingFiles is implied.
840840
*/
841-
public void commit( QemuImgFile file, QemuImgFile base, boolean deleteFile) throws QemuImgException {
841+
public void commit(QemuImgFile file, QemuImgFile base, boolean skipEmptyingFiles) throws QemuImgException {
842842
if (file == null) {
843843
throw new QemuImgException("File should not be null");
844844
}
845845

846846
final Script s = new Script(_qemuImgPath, timeout);
847847
s.add("commit");
848-
if (deleteFile) {
848+
if (skipEmptyingFiles) {
849849
s.add("-d");
850850
}
851851

0 commit comments

Comments
 (0)