Change in vdsm[master]: Use same constants for configuring and check configure of sa...

ybronhei at redhat.com ybronhei at redhat.com
Mon Feb 3 16:58:24 UTC 2014


Yaniv Bronhaim has uploaded a new change for review.

Change subject: Use same constants for configuring and check configure of sanlock
......................................................................

Use same constants for configuring and check configure of sanlock

Both DISKIMAGE_GROUP and QEMU_PROCESS_GROUP points to 'qemu', but its
confusing to use both one for configure and one for verification.
The patch uses the same constants and check also if VDSM_GROUP is also
set properly as required by sanlock process.

Change-Id: I424fdf30e0c5377846976505633d674f21ee7438
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M lib/vdsm/tool/configurator.py
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/24011/1

diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py
index fc893ea..9e47618 100644
--- a/lib/vdsm/tool/configurator.py
+++ b/lib/vdsm/tool/configurator.py
@@ -24,8 +24,7 @@
 
 from .. import utils
 from . import service, expose
-from ..constants import P_VDSM_EXEC, DISKIMAGE_GROUP
-from ..constants import QEMU_PROCESS_GROUP, VDSM_GROUP
+from ..constants import P_VDSM_EXEC, QEMU_PROCESS_GROUP, VDSM_GROUP
 
 
 class _ModuleConfigure(object):
@@ -159,7 +158,8 @@
                         break
                 else:
                     raise RuntimeError("Unable to find sanlock service groups")
-            configured = grp.getgrnam(DISKIMAGE_GROUP)[2] in groups
+            configured = grp.getgrnam(QEMU_PROCESS_GROUP)[2] in groups and \
+                grp.getgrnam(VDSM_GROUP)[2] in groups
         except IOError as e:
             if e.errno == os.errno.ENOENT:
                 sys.stdout.write("sanlock service is not running\n")


-- 
To view, visit http://gerrit.ovirt.org/24011
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I424fdf30e0c5377846976505633d674f21ee7438
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>


More information about the vdsm-patches mailing list