Maor Lipchuk has uploaded a new change for review.
Change subject: for_now
......................................................................
for_now
Change-Id: I325ee1a112bfea4b502ab98dbf592686b5227e22
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M vdsm/storage/blockVolume.py
M vdsm/storage/fileVolume.py
M vdsm/storage/image.py
M vdsm/storage/sdm/api/copy_data.py
M vdsm/storage/sdm/volume_artifacts.py
M vdsm/storage/volume.py
M vdsm/virt/vm.py
7 files changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/64506/1
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index af9203d..3cdfbe0 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -468,6 +468,8 @@
"sectors", sc.type2name(volFormat), volPath,
size)
if volFormat == sc.COW_FORMAT:
+ cls.log.info("Maor block_volume qcow2: %s",
+ dom.qcow2_compat())
qemuimg.create(
volPath, size * BLOCK_SIZE, sc.fmt2str(volFormat),
qcow2Compat=dom.qcow2_compat())
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index 546b5a6..dded69e 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -434,6 +434,8 @@
"sectors", sc.type2name(volFormat), volPath,
size)
if volFormat == sc.COW_FORMAT:
+ cls.log.info("Maor file_volume.py qow2: %s",
+ dom.qcow2_compat())
qemuimg.create(volPath, sizeBytes, sc.fmt2str(volFormat),
qcow2Compat=dom.qcow2_compat())
else:
diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py
index 8fa36d6..ef81064 100644
--- a/vdsm/storage/image.py
+++ b/vdsm/storage/image.py
@@ -472,6 +472,8 @@
backing = None
backingFormat = None
+ self.log.info("Maor image.py qcow2: %s",
+ destDom.qcow2_compat())
operation = qemuimg.convert(
srcVol.getVolumePath(),
dstVol.getVolumePath(),
@@ -861,6 +863,8 @@
dstVol.prepare(rw=True, setrw=True)
try:
+ self.log.info("Maor image.py qcow2(2): %s",
+ destDom.qcow2_compat())
operation = qemuimg.convert(
volParams['path'],
dstPath,
@@ -1106,6 +1110,8 @@
# Step 2: Convert successor to new volume
# qemu-img convert -f qcow2 successor -O raw newUUID
try:
+ self.log.info("Maor image.py qcow2(3): %s",
+ sdDom.qcow2_compat())
operation = qemuimg.convert(
srcVolParams['path'],
newVol.getVolumePath(),
diff --git a/vdsm/storage/sdm/api/copy_data.py
b/vdsm/storage/sdm/api/copy_data.py
index b2ffa2d..f6005fa 100644
--- a/vdsm/storage/sdm/api/copy_data.py
+++ b/vdsm/storage/sdm/api/copy_data.py
@@ -73,6 +73,8 @@
src_format = self._source.qemu_format
dst_format = self._dest.qemu_format
+ self.log.info("Maor copy_data qow2: %s",
+ self._dest.qcow2_compat)
self._operation = qemuimg.convert(
self._source.path,
self._dest.path,
diff --git a/vdsm/storage/sdm/volume_artifacts.py
b/vdsm/storage/sdm/volume_artifacts.py
index 51ce596..6fdc878 100644
--- a/vdsm/storage/sdm/volume_artifacts.py
+++ b/vdsm/storage/sdm/volume_artifacts.py
@@ -142,6 +142,8 @@
def _initialize_volume(self, vol_format, size):
if vol_format == sc.COW_FORMAT:
+ self.log.info("Maor at volume artifacts: create qcow2_compat, %s",
+ self.sd_manifest.qcow2_compat())
qemuimg.create(self.volume_path, size, sc.fmt2str(vol_format),
qcow2Compat=self.sd_manifest.qcow2_compat())
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index 7dcc4aa..3e3ab8b 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -691,6 +691,8 @@
dstPath)
parent = getBackingVolumePath(self.imgUUID, self.volUUID)
domain = sdCache.produce(self.sdUUID)
+ self.log.info("Maor volume.py qcow2: %s",
+ domain.qcow2_compat())
qemuimg.create(dstPath, backing=parent,
format=sc.fmt2str(volFormat),
backingFormat=sc.fmt2str(self.getFormat()),
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index a1f8fcc..594d544 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -2699,6 +2699,8 @@
prefix="%s-%s." % (diskParams['domainID'], diskParams['volumeID']))
try:
+ self.log.info("Maor block_volume qcow2: %s",
+ self._dom.qcow2_compat())
qemuimg.create(transientPath, format=qemuimg.FORMAT.QCOW2,
backing=diskParams['path'],
backingFormat=driveFormat,
--
To view, visit https://gerrit.ovirt.org/64506
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I325ee1a112bfea4b502ab98dbf592686b5227e22
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
