Change in vdsm[ovirt-3.3]: vdsm: pre-defined range for spice/vnc ports
by Vinzenz Feenstra
Hello Dan Kenigsberg, Peter V. Saveliev, Michal Skrivanek,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/23940
to review the following change.
Change subject: vdsm: pre-defined range for spice/vnc ports
......................................................................
vdsm: pre-defined range for spice/vnc ports
Libvirt's default port range 5900-65535 which is out of VDSM's
documented range 5634 to 6166. But since the medieval time we
already use libvirt's default. We'll define the new range as
5900-6923 (1024 ports) So:
1. Set some limited port range, that can be used in FW conf
2. Use start port 5900 as it is already used by customers
3. Use the endport as 6923
4. Change VDSM documentation according to new port range
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1052162
Signed-off-by: Peter V. Saveliev <peet(a)redhat.com>
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Change-Id: Id42d41064e122f1b2dcc98506b58d0cc74239650
Reviewed-on: http://gerrit.ovirt.org/17058
Reviewed-by: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Tested-by: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/23940/1
diff --git a/lib/vdsm/tool/libvirt_configure.sh.in b/lib/vdsm/tool/libvirt_configure.sh.in
index cf70f59..ea0500c 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -156,7 +156,7 @@
# package version, so anything meaningful can be used here. Since a hard
# coded version string has been already used, for compatibility we will
# continue to use this string.
- local by_vdsm_vers="4.10.3"
+ local by_vdsm_vers="4.13.0"
local start_conf_section="## beginning of configuration section ${by_vdsm}"
local end_conf_section="## end of configuration section ${by_vdsm}"
@@ -241,6 +241,10 @@
set_if_default "${lconf}" listen_tls 0
fi
+ # Configure remote display port range
+ set_if_default "${qconf}" remote_display_port_min 5900
+ set_if_default "${qconf}" remote_display_port_max 6923
+
# Configuring sanlock
if [ "${ENABLE_LIBVIRT_SANLOCK}" = "yes" ]; then
set_if_default "${qconf}" lock_manager \"sanlock\"
--
To view, visit http://gerrit.ovirt.org/23940
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id42d41064e122f1b2dcc98506b58d0cc74239650
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Gerrit-Reviewer: Peter V. Saveliev <peet(a)redhat.com>
10 years, 2 months
Change in vdsm[master]: spec: do not remove vdsm logs when pkg removed
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: spec: do not remove vdsm logs when pkg removed
......................................................................
spec: do not remove vdsm logs when pkg removed
In the commits 4a07386 0b6035a we introduced the concept
of creating of metadata.log, mom.log, supervdsm.log and vdsm.log
logs during the rpm install and sets the proper
user/group. However, now when removing vdsm the logs are removed too
which is not the behaviour as before these commits. This patch will
add ghost macro in the spec to keep logs available when vdsm is removed.
Change-Id: Idc8e62d5a0a6166c9141fe9d6016a525a3331694
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/23876/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 6ff477e..d4ebc43 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -612,12 +612,10 @@
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
-# Creating VDSM logs
+# Creating VDSM logs in this session to avoid rpmbuild
+# complain during the build
install -dDm 0755 %{buildroot}@VDSMLOGDIR@
-touch %{buildroot}@VDSMLOGDIR(a)/metadata.log
-touch %{buildroot}@VDSMLOGDIR(a)/mom.log
-touch %{buildroot}@VDSMLOGDIR(a)/supervdsm.log
-touch %{buildroot}@VDSMLOGDIR(a)/vdsm.log
+touch %{buildroot}@VDSMLOGDIR(a)/{metadata.log,mom.log,supervdsm.log,vdsm.log}
# Install the respawn utility
install -Dm 0755 init/sysvinit/respawn \
@@ -692,6 +690,14 @@
%{_bindir}/vdsm-tool sebool-config || :
# set the vdsm "secret" password for libvirt
%{_bindir}/vdsm-tool set-saslpasswd
+
+# After vdsm install we should create the logs files.
+# In the install session we create it but since we use
+# the ghost macro (in files session) the files are not included
+touch @VDSMLOGDIR(a)/{metadata.log,mom.log,supervdsm.log,vdsm.log}
+chmod 0644 @VDSMLOGDIR(a)/{metadata.log,mom.log,supervdsm.log,vdsm.log}
+chown @VDSMUSER@:@VDSMGROUP@ @VDSMLOGDIR(a)/{metadata.log,mom.log,vdsm.log}
+chown root:root @VDSMLOGDIR(a)/supervdsm.log
# Have moved vdsm section in /etc/sysctl.conf to /etc/sysctl.d/vdsm.conf.
# So Remove them if it is played with /etc/sysctl.conf.
@@ -883,10 +889,10 @@
%endif
%dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@
-%config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR(a)/metadata.log
-%config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR(a)/mom.log
-%config %attr(0644, root, root) @VDSMLOGDIR(a)/supervdsm.log
-%config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR(a)/vdsm.log
+%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR(a)/metadata.log
+%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR(a)/mom.log
+%ghost %config %attr(0644, root, root) @VDSMLOGDIR(a)/supervdsm.log
+%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR(a)/vdsm.log
%ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/hsm-tasks
%ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/mnt
%dir %{_libexecdir}/%{vdsm_name}
--
To view, visit http://gerrit.ovirt.org/23876
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc8e62d5a0a6166c9141fe9d6016a525a3331694
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
10 years, 2 months
Change in vdsm[master]: hsm: Support both None and empty dict
by Nir Soffer
Nir Soffer has uploaded a new change for review.
Change subject: hsm: Support both None and empty dict
......................................................................
hsm: Support both None and empty dict
Piotr claims that using the json schema, it is not possible to send null
in the engine, when the schema define a required parameter of type dict.
This patch change hsm to accept both None and {} as valid value meaning
use the old disk based pool backend.
I'm not sure if this is correct, and hopefully we can have a better fix
by changing the json schema or the bridge. This is mainly for making it
easier for Piotr to continue with the jsonrpc work.
Change-Id: Ia107707d8824c2abb8735518ae885e5f6d8abd3b
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
M vdsm/storage/hsm.py
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/23977/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 53c9dd0..e2ea707 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -1014,10 +1014,7 @@
raise se.StoragePoolConnected(
"hostId=%s, newHostId=%s" % (pool.id, hostId))
- if domainsMap is None:
- if not isinstance(pool.getBackend(), StoragePoolDiskBackend):
- raise se.StoragePoolConnected('Cannot downgrade pool backend')
- else:
+ if domainsMap:
if isinstance(pool.getBackend(), StoragePoolMemoryBackend):
pool.getBackend().updateVersionAndDomains(
masterVersion, domainsMap)
@@ -1025,6 +1022,9 @@
# Live pool backend upgrade
pool.setBackend(
StoragePoolMemoryBackend(pool, masterVersion, domainsMap))
+ else:
+ if not isinstance(pool.getBackend(), StoragePoolDiskBackend):
+ raise se.StoragePoolConnected('Cannot downgrade pool backend')
pool.refresh(msdUUID, masterVersion)
@@ -1065,11 +1065,11 @@
pool = sp.StoragePool(spUUID, self.domainMonitor, self.taskMng)
pool.backend = StoragePoolDiskBackend(pool)
- if domainsMap is None:
- pool.setBackend(StoragePoolDiskBackend(pool))
- else:
+ if domainsMap:
pool.setBackend(
StoragePoolMemoryBackend(pool, masterVersion, domainsMap))
+ else:
+ pool.setBackend(StoragePoolDiskBackend(pool))
# Must register domain state change callbacks *before* connecting
# the pool, which starts domain monitor threads. Otherwise we will
--
To view, visit http://gerrit.ovirt.org/23977
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia107707d8824c2abb8735518ae885e5f6d8abd3b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
10 years, 2 months
Change in vdsm[master]: Avoid spec error outputs during installing VDSM
by ybronhei＠redhat.com
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Avoid spec error outputs during installing VDSM
......................................................................
Avoid spec error outputs during installing VDSM
Calling to vdsm-tool inside spec file can raise exceptions. We should
direct stderr to /dev/null in each call.
This miss that was fixed by this patch leaded to exception print during
downgrading vdsm from 3.4 to 3.3.
Change-Id: I1b88efcf4bea3a841c1ff9795af90cf75df44b7d
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/23454/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index a97045b..fb01ab2 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -679,9 +679,9 @@
/usr/sbin/usermod -a -G %{qemu_group},%{snlk_group} %{vdsm_user}
%post
-%{_bindir}/vdsm-tool sebool-config || :
+%{_bindir}/vdsm-tool sebool-config >/dev/null 2>&1 || :
# set the vdsm "secret" password for libvirt
-%{_bindir}/vdsm-tool set-saslpasswd
+%{_bindir}/vdsm-tool set-saslpasswd >/dev/null 2>&1 || :
# Have moved vdsm section in /etc/sysctl.conf to /etc/sysctl.d/vdsm.conf.
# So Remove them if it is played with /etc/sysctl.conf.
--
To view, visit http://gerrit.ovirt.org/23454
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b88efcf4bea3a841c1ff9795af90cf75df44b7d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
10 years, 2 months
Change in vdsm[ovirt-3.4]: vdsm.spec: vdsm should own vdsm.log
by Douglas Schilling Landgraf
Hello Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/23718
to review the following change.
Change subject: vdsm.spec: vdsm should own vdsm.log
......................................................................
vdsm.spec: vdsm should own vdsm.log
/var/log/vdsm/vdsm.log should be owned by VDSM.
Change-Id: Id12a78f3243138cd95a13cc7c8a8d3d499ceee4a
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1055153
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/23696
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/23718/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7912635..da6e45e 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -610,6 +610,11 @@
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
+# VDSM Log
+install -dDm 0755 %{buildroot}@VDSMLOGDIR@
+# Avoid rpmbuild complain about vdsm.log doesn't exist during the build
+touch %{buildroot}@VDSMLOGDIR(a)/vdsm.log
+
# Install the respawn utility
install -Dm 0755 init/sysvinit/respawn \
%{buildroot}%{_datadir}/%{vdsm_name}/respawn
@@ -874,6 +879,7 @@
%endif
%dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@
+%ghost %config %attr(0644, %{vdsm_user}, %{vdsm_group}) @VDSMLOGDIR(a)/vdsm.log
%ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/hsm-tasks
%ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/mnt
%dir %{_libexecdir}/%{vdsm_name}
--
To view, visit http://gerrit.ovirt.org/23718
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id12a78f3243138cd95a13cc7c8a8d3d499ceee4a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
10 years, 2 months
Change in vdsm[ovirt-3.3]: sos: plugin should ignore /var/run/vdsm/storage
by Douglas Schilling Landgraf
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: sos: plugin should ignore /var/run/vdsm/storage
......................................................................
sos: plugin should ignore /var/run/vdsm/storage
In case sos plugin includes /var/run/vdsm/storage and it contains
symlinks to block devices it can make the host fill the disk
and eventually create a 0 sized sosreport.
Change-Id: Ie60d681cc744f2407a0ddf9406225e73497ac648
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm/sos/vdsm.py.in
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/23930/1
diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in
index 63a028c..6e4e60b 100644
--- a/vdsm/sos/vdsm.py.in
+++ b/vdsm/sos/vdsm.py.in
@@ -120,5 +120,6 @@
import glob
for f in glob.glob("@VDSMRUNDIR@/*"):
- if not f.endswith('.vfd') and not f.endswith('/isoUploader'):
+ if not f.endswith('.vfd') and not f.endswith('/isoUploader') \
+ and not f.endswith('/storage'):
self.addCopySpec(f)
--
To view, visit http://gerrit.ovirt.org/23930
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie60d681cc744f2407a0ddf9406225e73497ac648
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
10 years, 2 months
Change in vdsm[ovirt-3.4]: sos: plugin should ignore /var/run/vdsm/storage
by Douglas Schilling Landgraf
Hello Dan Kenigsberg,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/23947
to review the following change.
Change subject: sos: plugin should ignore /var/run/vdsm/storage
......................................................................
sos: plugin should ignore /var/run/vdsm/storage
In case sos plugin includes /var/run/vdsm/storage and it contains
symlinks to block devices it can make the host fill the disk
and eventually create a 0 sized sosreport.
Change-Id: Ie60d681cc744f2407a0ddf9406225e73497ac648
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/23925
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/sos/vdsm.py.in
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/23947/1
diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in
index 2f50e75..6bc111a 100644
--- a/vdsm/sos/vdsm.py.in
+++ b/vdsm/sos/vdsm.py.in
@@ -121,5 +121,6 @@
import glob
for f in glob.glob("@VDSMRUNDIR@/*"):
- if not f.endswith('.vfd') and not f.endswith('/isoUploader'):
+ if not f.endswith('.vfd') and not f.endswith('/isoUploader') \
+ and not f.endswith('/storage'):
self.addCopySpec(f)
--
To view, visit http://gerrit.ovirt.org/23947
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie60d681cc744f2407a0ddf9406225e73497ac648
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
10 years, 2 months