Skip to content

Commit cd2ad36

Browse files
code cleanup
1 parent 0efc5f7 commit cd2ad36

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,27 +1839,11 @@ public Answer createSnapshot(final CreateObjectCommand cmd) {
18391839
logger.debug("Attempting to create RBD snapshot " + disk.getName() + "@" + snapshotName);
18401840
image.snapCreate(snapshotName);
18411841

1842-
RbdImageInfo imageInfo = image.stat();
1843-
logger.debug("RBD image " + image.getName() + " info - size: " + imageInfo.size + ", obj_size: " + imageInfo.obj_size + ", num_objs: " + imageInfo.num_objs);
1844-
18451842
long rbdSnapshotSize = getRdbSnapshotSize(primaryPool.getSourceDir(), disk.getName(), snapshotName, primaryPool.getSourceHost(), primaryPool.getAuthUserName(), primaryPool.getAuthSecret());
18461843
if (rbdSnapshotSize > 0) {
18471844
snapshotSize = rbdSnapshotSize;
18481845
}
18491846

1850-
List<RbdSnapInfo> snapInfo = image.snapList();
1851-
for (RbdSnapInfo snap : snapInfo) {
1852-
logger.debug("RBD snap info - id: " + snap.id + ", name:" + snap.name + ", size: " + snap.size);
1853-
}
1854-
1855-
final RbdImage imageSnap = rbd.open(disk.getName(), snapshotName);
1856-
imageSnap.stat();
1857-
logger.debug("RBD image snapshot " + image.getName() + " info - size: " + imageInfo.size + ", obj_size: " + imageInfo.obj_size + ", num_objs: " + imageInfo.num_objs);
1858-
1859-
final RbdImage snap = rbd.open(disk.getName() + "@" + snapshotName);
1860-
snap.stat();
1861-
logger.debug("RBD snapshot " + image.getName() + " info - size: " + imageInfo.size + ", obj_size: " + imageInfo.obj_size + ", num_objs: " + imageInfo.num_objs);
1862-
18631847
rbd.close(image);
18641848
r.ioCtxDestroy(io);
18651849
} catch (final Exception e) {
@@ -1900,11 +1884,9 @@ public Answer createSnapshot(final CreateObjectCommand cmd) {
19001884

19011885
private long getRdbSnapshotSize(String poolPath, String diskName, String snapshotName, String rbdMonitor, String authUser, String authSecret) {
19021886
logger.debug("Get RBD snapshot size for {}/{}@{}", poolPath, diskName, snapshotName);
1903-
//rbd du cloudstack/e29110ce-ffab-4a27-b2ad-6d87905039d8@d2e2d6d5-ff66-46f1-be7b-76e0504e965d --format json --pretty-format
1904-
//rbd du cloudstack/e29110ce-ffab-4a27-b2ad-6d87905039d8@d2e2d6d5-ff66-46f1-be7b-76e0504e965d --format json --mon-host 10.0.33.201 --id cloudstack --key AQApZshoQKVHCxAA42Bb8kBoUyLH2cEcFbd2jQ== 2>/dev/null
1887+
//cmd: rbd du <pool>/<disk-name>@<snapshot-name> --format json --mon-host <monitor-host> --id <user> --key <key> 2>/dev/null
19051888
String snapshotDetailsInJson = Script.runSimpleBashScript(String.format("rbd du %s/%s@%s --format json --mon-host %s --id %s --key %s 2>/dev/null", poolPath, diskName, snapshotName, rbdMonitor, authUser, authSecret));
19061889
if (StringUtils.isNotBlank(snapshotDetailsInJson)) {
1907-
logger.debug("RBD snapshot size for {}/{}@{} cmd output: ", poolPath, diskName, snapshotName, snapshotDetailsInJson);
19081890
ObjectMapper mapper = new ObjectMapper();
19091891
try {
19101892
JsonNode root = mapper.readTree(snapshotDetailsInJson);

0 commit comments

Comments
 (0)