Change in vdsm[master]: Don't user sudo in fuser

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&gt;
---
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&gt;

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

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&gt;
---
M vdsm/storage/blockSD.py
M vdsm/storage/fuser.py
M vdsm/sudoers.vdsm.in
M vdsm/supervdsmServer.py
4 files changed, 9 insertions(+), 4 deletions(-)

Approvals:
  Antoni Segura Puimedon: Verified
  Dan Kenigsberg: Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

Antoni Segura Puimedon has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 2: Verified

Fixes make rpm unit tests in F19.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 2: Looks good to me, approved

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 2: Fails

Build Failed 

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1896/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1947/ : FAILURE

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 2:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1896/ (2/2)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 2:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1947/ (1/2)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 1:

darn, but the unit test still needs to be fixed!

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 1: Fails

Build Failed 

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1888/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1939/ : FAILURE

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 1: I would prefer that you didn't submit this

please drop FUSER_PATH from sudoers.vdsm.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1939/ (2/2)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Don't user sudo in fuser
......................................................................


Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1888/ (1/2)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I74842ffda1bc1d5ebb54de5e1933fedd851e745b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server