Eduardo has uploaded a new change for review.
Change subject: Remove redundant supervsdm.validateAccess.
......................................................................
Remove redundant supervsdm.validateAccess.
Change-Id: Id37865225ea2d29361d6e588f9bb0acf7bf71cec
Signed-off-by: Eduardo <ewarszaw(a)redhat.com>
---
M vdsm/storage/fileSD.py
M vdsm/supervdsmServer
2 files changed, 0 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/20838/1
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index f9ff93b..47c5448 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -35,7 +35,6 @@
from persistentDict import PersistentDict, DictValidator
from vdsm import constants
from vdsm.utils import stripNewLines
-import supervdsm
import mount
REMOTE_PATH = "REMOTE_PATH"
@@ -50,10 +49,6 @@
def validateDirAccess(dirPath):
try:
getProcPool().fileUtils.validateAccess(dirPath)
- supervdsm.getProxy().validateAccess(
- constants.QEMU_PROCESS_USER,
- (constants.DISKIMAGE_GROUP, constants.METADATA_GROUP), dirPath,
- (os.R_OK | os.X_OK))
except OSError as e:
if e.errno == errno.EACCES:
raise se.StorageServerAccessPermissionError(dirPath)
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index d42e320..7a9c3da 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -57,7 +57,6 @@
from storage.iscsi import readSessionInfo as _readSessionInfo
from supervdsm import _SuperVdsmManager
from storage.fileUtils import chown, resolveGid, resolveUid
-from storage.fileUtils import validateAccess as _validateAccess
from vdsm.constants import METADATA_GROUP, EXT_UDEVADM, \
DISKIMAGE_USER, DISKIMAGE_GROUP, P_LIBVIRT_VMCHANNELS, VDSM_USER
from storage.devicemapper import _removeMapping, _getPathsStatus
@@ -237,11 +236,6 @@
raise err
return res
-
- @logDecorator
- def validateAccess(self, user, groups, *args, **kwargs):
- return self._runAs(user, groups, _validateAccess, args=args,
- kwargs=kwargs)
@logDecorator
def setSafeNetworkConfig(self):
--
To view, visit
http://gerrit.ovirt.org/20838
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id37865225ea2d29361d6e588f9bb0acf7bf71cec
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>