Change in vdsm[master]: Don't user sudo in fuser - vdsm-patches - Fedora mailing-lists

10 Apr 2013

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@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@redhat.com

    