Change in vdsm[master]: Don't report 'imageID' for non-vdsm images in _getDiskStats(...
by wudxw@linux.vnet.ibm.com
Mark Wu has uploaded a new change for review.
Change subject: Don't report 'imageID' for non-vdsm images in _getDiskStats()
......................................................................
Don't report 'imageID' for non-vdsm images in _getDiskStats()
Non-vdsm images don't have the attribute 'imageID'. It causes that
_getDiskStats doesn't work for them. So change to only report
'imageID' for vdsm images.
Change-Id: I2a017ba80cd94ee098c7cd7a30095740870c3825
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
---
M vdsm/libvirtvm.py
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/6055/1
--
To view, visit http://gerrit.ovirt.org/6055
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a017ba80cd94ee098c7cd7a30095740870c3825
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>
11 years
Change in vdsm[master]: changed upstart_libvirt function name
by ybronhei@redhat.com
Yaniv Bronhaim has uploaded a new change for review.
Change subject: changed upstart_libvirt function name
......................................................................
changed upstart_libvirt function name
Change-Id: I7b773b04766346ab93333b00fba6a1f083cffd89
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M vdsm/vdsmd.init.in
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/7671/1
diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in
index 4a66136..397d888 100755
--- a/vdsm/vdsmd.init.in
+++ b/vdsm/vdsmd.init.in
@@ -147,7 +147,7 @@
return 0
}
-upstart_libvirt() {
+libvirt_should_use_upstart() {
[[ -x /sbin/initctl ]]
}
@@ -414,7 +414,7 @@
stop_libvirtd_sysv() {
# stop libvirt SysV service if we intend to configure upstart
- if upstart_libvirt && ! [[ -f /etc/init/libvirtd.conf ]]; then
+ if libvirt_should_use_upstart && ! [[ -f /etc/init/libvirtd.conf ]]; then
/sbin/chkconfig libvirtd off
/sbin/service libvirtd stop
fi
@@ -442,7 +442,7 @@
local packaged target
local startout
- if ! upstart_libvirt; then
+ if ! libvirt_should_use_upstart; then
/sbin/service libvirtd start
return
fi
--
To view, visit http://gerrit.ovirt.org/7671
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b773b04766346ab93333b00fba6a1f083cffd89
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
11 years
Change in vdsm[master]: Correct vdsClient's help for the verb getVmsInfo
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Correct vdsClient's help for the verb getVmsInfo
......................................................................
Correct vdsClient's help for the verb getVmsInfo
Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=727791
replace the help with the following:
getVmsInfo <spUUID> [<sdUUID> [vmList](vmId1,vmId2,...)]
Change-Id: I152f28dea29f6ac6bb61c0597dbd3b596646c569
Signed-off-by: Zhu Bo <bozhu(a)linux.vnet.ibm.com>
---
M vdsm_cli/vdsClient.py
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Dan Kenigsberg: Verified; Looks good to me, approved
Zhou Zheng Sheng: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/7560
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I152f28dea29f6ac6bb61c0597dbd3b596646c569
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhu Bo <bozhu(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhu Bo <bozhu(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years
Change in vdsm[master]: Correct vdsClient's help for the verb getVmsInfo
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: Correct vdsClient's help for the verb getVmsInfo
......................................................................
Patch Set 4: Verified; Looks good to me, approved
Thanks!
--
To view, visit http://gerrit.ovirt.org/7560
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I152f28dea29f6ac6bb61c0597dbd3b596646c569
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhu Bo <bozhu(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhu Bo <bozhu(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years
Change in vdsm[master]: Correct vdsClient's help for the verb getVmsInfo
by zhshzhou@linux.vnet.ibm.com
Zhou Zheng Sheng has posted comments on this change.
Change subject: Correct vdsClient's help for the verb getVmsInfo
......................................................................
Patch Set 4: Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/7560
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I152f28dea29f6ac6bb61c0597dbd3b596646c569
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhu Bo <bozhu(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhu Bo <bozhu(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years
Change in vdsm[master]: nfs-check: check if /tmp exists
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: nfs-check: check if /tmp exists
......................................................................
nfs-check: check if /tmp exists
I have received a debian user reporting that nfs-check didn't work..
analysing the case, we discovered that the system didn't contain /tmp
directory.
Change-Id: If364f703b1ab2223d194c4e300da824e0696d50b
---
M contrib/nfs-check.py
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/3167/1
--
To view, visit http://gerrit.ovirt.org/3167
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If364f703b1ab2223d194c4e300da824e0696d50b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
11 years
Change in vdsm[master]: Update the lvm rules permissions with sanlock
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: Update the lvm rules permissions with sanlock
......................................................................
Update the lvm rules permissions with sanlock
The MODE keyword in the lvm rules wasn't used by udev. However a newer
version shipped with Fedora 17 is considering its value.
The MODE and the GROUP values should be updated to allow sanlock to
access the ids and the leases LVs.
RHBZ: 850440
Change-Id: Idfca402c4264788a4e01349cc72e5fa3587b6222
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm/storage/12-vdsm-lvm.rules
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/7446/1
diff --git a/vdsm/storage/12-vdsm-lvm.rules b/vdsm/storage/12-vdsm-lvm.rules
index b7a9d4c..398992d 100644
--- a/vdsm/storage/12-vdsm-lvm.rules
+++ b/vdsm/storage/12-vdsm-lvm.rules
@@ -25,11 +25,11 @@
ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]_MERGE", OWNER:="vdsm", GROUP:="qemu", GOTO="lvm_end"
ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="_remove_me_[a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9]_[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", OWNER:="vdsm", GROUP:="qemu", GOTO="lvm_end"
ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="metadata", MODE:="0600", OWNER:="vdsm", GROUP:="qemu", GOTO="lvm_end"
-ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="ids", MODE:="0600", OWNER:="vdsm", GROUP:="qemu", GOTO="lvm_end"
+ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="ids", MODE:="0660", OWNER:="vdsm", GROUP:="sanlock", GOTO="lvm_end"
ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="inbox", MODE:="0600", OWNER:="vdsm", GROUP:="qemu", GOTO="lvm_end"
ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="outbox", MODE:="0600", OWNER:="vdsm", GROUP:="qemu", GOTO="lvm_end"
-ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="leases", MODE:="0600", OWNER:="vdsm", GROUP:="qemu", GOTO="lvm_end"
+ENV{DM_VG_NAME}=="[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]", ENV{DM_LV_NAME}=="leases", MODE:="0660", OWNER:="vdsm", GROUP:="sanlock", GOTO="lvm_end"
-# FIXME: make special lvs vdsm-only readable (MODE doesn't work)
+# FIXME: make special lvs vdsm-only readable, MODE doesn't work on rhel6
LABEL="lvm_end"
--
To view, visit http://gerrit.ovirt.org/7446
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfca402c4264788a4e01349cc72e5fa3587b6222
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
11 years
Change in vdsm[master]: Make svdsm files depend on path definitions
by shuming@linux.vnet.ibm.com
Shu Ming has uploaded a new change for review.
Change subject: Make svdsm files depend on path definitions
......................................................................
Make svdsm files depend on path definitions
The files created by super vdsm process should
be put into path defined by the path definition
in constants.py
Change-Id: Ia952e930d719c65a9bc503f8a097bdfc26b5a397
Signed-off-by: Shu Ming <shuming(a)linux.vnet.ibm.com>
---
M vdsm/supervdsm.py
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/7540/1
diff --git a/vdsm/supervdsm.py b/vdsm/supervdsm.py
index 3e881e8..7031a79 100644
--- a/vdsm/supervdsm.py
+++ b/vdsm/supervdsm.py
@@ -45,8 +45,9 @@
raise RuntimeError("SuperVDSM Server not found")
-PIDFILE = "/var/run/vdsm/svdsm.pid"
-ADDRESS = "/var/run/vdsm/svdsm.sock"
+VAR_RUN_VDSM = constants.P_VDSM_RUN
+PIDFILE = os.path.join(VAR_RUN_VDSM, "svdsm.pid")
+ADDRESS = os.path.join(VAR_RUN_VDSM, "svdm.sock")
SUPERVDSM = __supervdsmServerPath()
--
To view, visit http://gerrit.ovirt.org/7540
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia952e930d719c65a9bc503f8a097bdfc26b5a397
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Shu Ming <shuming(a)linux.vnet.ibm.com>
11 years
Change in vdsm[master]: Remove vdsm-restore-net-config from ignore list
by lvroyce@linux.vnet.ibm.com
Royce Lv has uploaded a new change for review.
Change subject: Remove vdsm-restore-net-config from ignore list
......................................................................
Remove vdsm-restore-net-config from ignore list
As commit 49999d16 remove vdsm-restore-net-config.in and add the python file,
remove from ignore list to track it.
Change-Id: I61fb428c999528b863d4b7dcc1ec5dea64cebe9d
Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com>
---
M .gitignore
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/7732/1
diff --git a/.gitignore b/.gitignore
index 8a63a02..d7a3472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,6 @@
vdsm/sudoers.vdsm
vdsm/vdsm-gencerts.sh
vdsm/vdsm-logrotate.conf
-vdsm/vdsm-restore-net-config
vdsm/vdsm-sosplugin.py
vdsm/vdsm-store-net-config
vdsm/vdsm.conf.sample
--
To view, visit http://gerrit.ovirt.org/7732
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61fb428c999528b863d4b7dcc1ec5dea64cebe9d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
11 years
Change in vdsm[master]: bootstrap: eliminate extra new line at ~/.ssh/authorized_key...
by Alon Bar-Lev
Alon Bar-Lev has uploaded a new change for review.
Change subject: bootstrap: eliminate extra new line at ~/.ssh/authorized_keys
......................................................................
bootstrap: eliminate extra new line at ~/.ssh/authorized_keys
In the past engine created ssh public keys without the terminating
newline. Now it was fixed.
Change-Id: If8cc3cedc7647b7e6b79c13aaac69289e4a2a562
Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com>
---
M vdsm_reg/deployUtil.py.in
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/7721/1
diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in
index ebc7d36..b555e35 100644
--- a/vdsm_reg/deployUtil.py.in
+++ b/vdsm_reg/deployUtil.py.in
@@ -615,7 +615,7 @@
resKeys.append(key)
except IOError:
logging.debug("Failed to read %s", path)
- resKeys.append('\n' + strKey)
+ resKeys.append(strKey)
if isOvirt():
# No problem to write to the original file here, since until it is not
--
To view, visit http://gerrit.ovirt.org/7721
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8cc3cedc7647b7e6b79c13aaac69289e4a2a562
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com>
11 years