Change in vdsm[master]: spec: enable gluster since fedora 19 and el6
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: spec: enable gluster since fedora 19 and el6
......................................................................
spec: enable gluster since fedora 19 and el6
Gluster recently built glusterfs-3.4 alpha2 for f19.
In this patch:
- enable gluster since fedora 19 and el6
- optimize the with_systemd definition to be consistent with the
gluster one
Change-Id: I68436bf10cecdaea8b3ce6c95797aac4895ec482
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/13791/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7a0e638..02150cf 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -17,15 +17,11 @@
%global _polkitdir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d
%endif
-# Gluster
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 6
%global with_gluster 1
-
-# Systemd macro
-%if 0%{?fedora} >= 15
-%global with_systemd 1
%endif
-%if 0%{?rhel} >= 7
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%global with_systemd 1
%endif
--
To view, visit http://gerrit.ovirt.org/13791
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68436bf10cecdaea8b3ce6c95797aac4895ec482
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
11 years
Change in vdsm[master]: spec: use the fedora systemd macros
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: spec: use the fedora systemd macros
......................................................................
spec: use the fedora systemd macros
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=850412
Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm.spec.in
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/12285/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 38838ea..e9289a7 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -528,12 +528,16 @@
/sbin/chkconfig --add vdsm-restore-net-config
fi
%else
+%if 0%{?fedora} >= 18
+%systemd_post vdsmd.service
+%else
if [ "$1" -eq 1 ] ; then
/bin/systemctl enable vdsmd.service >/dev/null 2>&1 || :
/bin/systemctl enable vdsm-restore-net-config.service >/dev/null 2>&1 || :
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
exit 0
+%endif
%endif
%preun
@@ -574,12 +578,16 @@
fi
fi
%else
+%if 0%{?fedora} >= 18
+%systemd_preun vdsmd.service
+%else
if [ "$1" -eq 0 ]; then
/bin/systemctl --no-reload disable vdsmd.service > /dev/null 2>&1 || :
/bin/systemctl --no-reload disable vdsm-restore-net-config.service > /dev/null 2>&1 || :
/bin/systemctl stop vdsmd.service > /dev/null 2>&1 || :
fi
exit 0
+%endif
%endif
%postun
@@ -589,11 +597,15 @@
fi
exit 0
%else
+%if 0%{?fedora} >= 18
+%systemd_postun_with_restart vdsmd.service
+%else
if [ "$1" -ge 1 ] ; then
/bin/systemctl try-restart vdsmd.service >/dev/null 2>&1 || :
fi
exit 0
%endif
+%endif
%if 0%{?rhel}
%triggerun -- libvirt
--
To view, visit http://gerrit.ovirt.org/12285
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76857a6b9ae1a945511f359333735b9497c5e2b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
11 years
Change in vdsm[master]: svdsm: fix fuser import in supervdsmServer
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: svdsm: fix fuser import in supervdsmServer
......................................................................
svdsm: fix fuser import in supervdsmServer
Change-Id: I319a96e1357b5ed47ef5b6bcf3dec0ce678b9748
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm/supervdsmServer.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/13804/1
diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py
index e325155..28d5955 100755
--- a/vdsm/supervdsmServer.py
+++ b/vdsm/supervdsmServer.py
@@ -26,7 +26,7 @@
import errno
import threading
import re
-import fuser
+from storage import fuser
from time import sleep
import signal
from multiprocessing import Pipe, Process
--
To view, visit http://gerrit.ovirt.org/13804
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I319a96e1357b5ed47ef5b6bcf3dec0ce678b9748
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
11 years
Change in vdsm[master]: Remove storage messages from syslog
by vvolansk＠redhat.com
Vered Volansky has uploaded a new change for review.
Change subject: Remove storage messages from syslog
......................................................................
Remove storage messages from syslog
This is a partial fix for bz920074. The rest of the fix will be sent in
patch Ifc0fa5ca50e4eb78d62fd3cdc8b09723486bcaa0 .
Change-Id: I5c6283fc2d478d56fbf513f6bbf7e1541b708d95
Bug-Url: https://bugzilla.redhat.com/920074
Signed-off-by: Vered Volansky <vvolansk(a)redhat.com>
---
M vdsm/logger.conf.in
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/13692/1
diff --git a/vdsm/logger.conf.in b/vdsm/logger.conf.in
index 0a4622f..824e169 100644
--- a/vdsm/logger.conf.in
+++ b/vdsm/logger.conf.in
@@ -20,7 +20,7 @@
[logger_Storage]
level=DEBUG
-handlers=syslog,logfile
+handlers=logfile
qualname=Storage
propagate=0
--
To view, visit http://gerrit.ovirt.org/13692
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c6283fc2d478d56fbf513f6bbf7e1541b708d95
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com>
11 years
Change in vdsm[master]: vdsm: change default migration bandwidth in conf
by peet＠redhat.com
Peter V. Saveliev has uploaded a new change for review.
Change subject: vdsm: change default migration bandwidth in conf
......................................................................
vdsm: change default migration bandwidth in conf
Libvirt changed the default behaviour in migration bandwith
definition. Prior to versions 0.10.x it used "0" to define
default 32MBps limit, now it uses "0" to define unlimited
speed.
This patch preserves the former way, when the default was
32MBps. It needed in enterprise environments, where mass
migration with unlimited bandwith can have a serious impact
on the network infrastructure.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=925981
Signed-off-by: Peter V. Saveliev <peet(a)redhat.com>
Change-Id: If9f3ac98d1868504c04d80eea5fc50d1d8cb1939
---
M lib/vdsm/config.py.in
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/13781/1
diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index 20edd2e..d58c3e2 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -55,9 +55,9 @@
'Time to wait (in seconds) for migration destination to start '
'listening before migration begins.'),
- ('migration_max_bandwidth', '0',
- 'Maximum bandwidth for migration, in mbps, 0 means libvirt\'s '
- 'default (30mbps?).'),
+ ('migration_max_bandwidth', '32',
+ 'Maximum bandwidth for migration, in MBps, 0 means libvirt\'s '
+ 'default: 32MBps or unlimited, depending on the version.'),
('migration_monitor_interval', '10',
'How often (in seconds) should the monitor thread pulse, 0 means '
--
To view, visit http://gerrit.ovirt.org/13781
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9f3ac98d1868504c04d80eea5fc50d1d8cb1939
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Peter V. Saveliev <peet(a)redhat.com>
11 years
Change in vdsm[master]: Don't user sudo in fuser
by smizrahi＠redhat.com
Saggi Mizrahi has uploaded a new change for review.
Change subject: Don't user sudo in fuser
......................................................................
Don't user sudo in fuser
Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com>
---
M vdsm/storage/blockSD.py
M vdsm/storage/fuser.py
M vdsm/supervdsmServer.py
3 files changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/79/13779/1
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 97b59db..c1b4725 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -49,7 +49,7 @@
from storage_mailbox import MAILBOX_SIZE
import resourceManager as rm
import mount
-from fuser import fuser
+import supervdsm as svdsm
STORAGE_DOMAIN_TAG = "RHAT_storage_domain"
STORAGE_UNREADY_DOMAIN_TAG = STORAGE_DOMAIN_TAG + "_UNREADY"
@@ -1193,7 +1193,8 @@
masterMount.umount()
except mount.MountError:
# umount failed, try to kill that processes holding mount point
- pids = fuser(masterMount.fs_file, mountPoint=True)
+ svdsmp = svdsm.getProxy()
+ pids = svdsmp.fuser(masterMount.fs_file, mountPoint=True)
# It was unmounted while I was checking no need to do anything
if not masterMount.isMounted():
diff --git a/vdsm/storage/fuser.py b/vdsm/storage/fuser.py
index 135dad6..0f235ee 100644
--- a/vdsm/storage/fuser.py
+++ b/vdsm/storage/fuser.py
@@ -27,7 +27,7 @@
cmd.append("-m")
cmd.append(path)
- (rc, out, err) = misc.execCmd(cmd, raw=True, sudo=True)
+ (rc, out, err) = misc.execCmd(cmd, raw=True, sudo=False)
if rc != 0:
return []
diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py
index 63f167a..e325155 100755
--- a/vdsm/supervdsmServer.py
+++ b/vdsm/supervdsmServer.py
@@ -26,6 +26,7 @@
import errno
import threading
import re
+import fuser
from time import sleep
import signal
from multiprocessing import Pipe, Process
@@ -303,6 +304,10 @@
def removeFs(self, path):
return mkimage.removeFs(path)
+ @logDecorator
+ def fuser(self, *args):
+ return fuser.fuser(*args)
+
def __udevReloadRules(self, guid):
if self.__udevOperationReload():
reload = "--reload"
--
To view, visit http://gerrit.ovirt.org/13779
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
11 years
Change in vdsm[master]: fuser.fuser() requires `sudo fuser`
by Dan Kenigsberg
Dan Kenigsberg has uploaded a new change for review.
Change subject: fuser.fuser() requires `sudo fuser`
......................................................................
fuser.fuser() requires `sudo fuser`
Fail politely if the testing user does not have it.
Change-Id: I8a58344cc679ffe30ad0fd345340c212f20fd9e6
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/fuserTests.py
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/13778/1
diff --git a/tests/fuserTests.py b/tests/fuserTests.py
index 7473dde..c5c34a4 100644
--- a/tests/fuserTests.py
+++ b/tests/fuserTests.py
@@ -22,10 +22,13 @@
from storage import fuser
from testrunner import VdsmTestCase
+from testValidation import checkSudo
class TestFuser(VdsmTestCase):
def testSelfExe(self):
pid = os.getpid()
- self.assertTrue(pid in fuser.fuser('/proc/%s/exe' % pid))
+ exeFile = '/proc/%s/exe' % pid
+ checkSudo(['fuser', exeFile])
+ self.assertTrue(pid in fuser.fuser(exeFile))
--
To view, visit http://gerrit.ovirt.org/13778
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a58344cc679ffe30ad0fd345340c212f20fd9e6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
11 years
