Martin Polednik has uploaded a new change for review. Change subject: supervdsm: remove unneeded version check ......................................................................
supervdsm: remove unneeded version check We now require higher version of systemd than 181, therefore checking that version > 181 is not required anymore. This also removes the need for branch in __udevReloadRules because the argument will always be --version. Change-Id: I47aa14c1f084b9d8456dc39b6da171188387b233 Signed-off-by: Martin Polednik <[email protected]> --- M vdsm/supervdsmServer 1 file changed, 1 insertion(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/44844/1 diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index 119c2ba..1663087 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -120,8 +120,6 @@ class _SuperVdsm(object): - UDEV_WITH_RELOAD_VERSION = 181 - log = logging.getLogger("SuperVdsm.ServerCallback") @logDecorator @@ -449,30 +447,13 @@ sysctl.set_rp_filter_strict(dev) def __udevReloadRules(self, guid): - if self.__udevOperationReload(): - reload = "--reload" - else: - reload = "--reload-rules" - cmd = [EXT_UDEVADM, 'control', reload] + cmd = [EXT_UDEVADM, 'control', '--reload'] rc, out, err = utils.execCmd(cmd) if rc: self.log.error("Udevadm reload-rules command failed rc=%s, " "out=\"%s\", err=\"%s\"", rc, out, err) raise OSError(errno.EINVAL, "Could not reload-rules for device " "%s" % guid) - - @utils.memoized - def __udevVersion(self): - cmd = [EXT_UDEVADM, '--version'] - rc, out, err = utils.execCmd(cmd) - if rc: - self.log.error("Udevadm version command failed rc=%s, " - " out=\"%s\", err=\"%s\"", rc, out, err) - raise RuntimeError("Could not get udev version number") - return int(out[0]) - - def __udevOperationReload(self): - return self.__udevVersion() > self.UDEV_WITH_RELOAD_VERSION def terminate(signo, frame): -- To view, visit https://gerrit.ovirt.org/44844 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47aa14c1f084b9d8456dc39b6da171188387b233 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Martin Polednik <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
