Martin Polednik has uploaded a new change for review.
Change subject: supervdsm: rename appropriateDevice to appropriateMultipathDevice ......................................................................
supervdsm: rename appropriateDevice to appropriateMultipathDevice
The appropriateDevice method inside supervdsm is inappropriately named as it is only used for multipath devices. This patch specializes the name so it is possible to write more of these specialized methods with correct specific names.
Change-Id: I8014dbfa333bc637914080082c6c186ed39594af Signed-off-by: Martin Polednik mpolednik@redhat.com --- M vdsm/storage/hsm.py M vdsm/supervdsmServer 2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/45420/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index cfee89f..2ab7b20 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3150,7 +3150,7 @@
Warning: Internal use only. """ - supervdsm.getProxy().appropriateDevice(guid, thiefId) + supervdsm.getProxy().appropriateMultipathDevice(guid, thiefId) supervdsm.getProxy().udevTriggerMultipath(guid) devPath = os.path.join(devicemapper.DMPATH_PREFIX, guid) utils.retry(partial(fileUtils.validateQemuReadable, devPath), @@ -3169,7 +3169,7 @@ """ Warning: Internal use only. """ - fails = supervdsm.getProxy().rmAppropriateRules(thiefId) + fails = supervdsm.getProxy().rmAppropriateMultipathRules(thiefId) if fails: self.log.error("Failed to remove the following rules: %s", fails)
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index d431ac2..3d64843 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -290,7 +290,7 @@ 'out %s\nerr %s' % (e.out, e.err))
@logDecorator - def appropriateDevice(self, guid, thiefId): + def appropriateMultipathDevice(self, guid, thiefId): ruleFile = _UDEV_RULE_FILE_NAME % (guid, thiefId) # WARNING: we cannot use USER, GROUP and MODE since using any of them # will change the selinux label to the default, causing vms to pause. @@ -302,7 +302,7 @@ rf.write(rule)
@logDecorator - def rmAppropriateRules(self, thiefId): + def rmAppropriateMultipathRules(self, thiefId): re_apprDevRule = "^" + _UDEV_RULE_FILE_PREFIX + ".*?-" + thiefId + \ _UDEV_RULE_FILE_EXT + "$" rules = [os.path.join(_UDEV_RULE_FILE_DIR, r) for r in
automation@ovirt.org has posted comments on this change.
Change subject: supervdsm: rename appropriateDevice to appropriateMultipathDevice ......................................................................
Patch Set 1:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Martin Polednik has posted comments on this change.
Change subject: supervdsm: rename appropriateDevice to appropriateMultipathDevice ......................................................................
Patch Set 1: Verified+1
Nir Soffer has posted comments on this change.
Change subject: supervdsm: rename appropriateDevice to appropriateMultipathDevice ......................................................................
Patch Set 1: Code-Review+2
automation@ovirt.org has posted comments on this change.
Change subject: supervdsm: rename appropriateDevice to appropriateMultipathDevice ......................................................................
Patch Set 2:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Dan Kenigsberg has submitted this change and it was merged.
Change subject: supervdsm: rename appropriateDevice to appropriateMultipathDevice ......................................................................
supervdsm: rename appropriateDevice to appropriateMultipathDevice
The appropriateDevice method inside supervdsm is inappropriately named as it is only used for multipath devices. This patch specializes the name so it is possible to write more of these specialized methods with correct specific names.
Change-Id: I8014dbfa333bc637914080082c6c186ed39594af Signed-off-by: Martin Polednik mpolednik@redhat.com Reviewed-on: https://gerrit.ovirt.org/45420 Reviewed-by: Nir Soffer nsoffer@redhat.com Continuous-Integration: Jenkins CI --- M vdsm/storage/hsm.py M vdsm/supervdsmServer 2 files changed, 4 insertions(+), 4 deletions(-)
Approvals: Nir Soffer: Looks good to me, approved Jenkins CI: Passed CI tests Martin Polednik: Verified
automation@ovirt.org has posted comments on this change.
Change subject: supervdsm: rename appropriateDevice to appropriateMultipathDevice ......................................................................
Patch Set 3:
* Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found.
vdsm-patches@lists.fedorahosted.org