Change in vdsm[ovirt-3.5]: vdsm-tool: Do not panic with sanlock empty groups

fromani at redhat.com fromani at redhat.com
Wed Oct 14 08:45:25 UTC 2015


Francesco Romani has submitted this change and it was merged.

Change subject: vdsm-tool: Do not panic with sanlock empty groups
......................................................................


vdsm-tool: Do not panic with sanlock empty groups

This fixes the following error:

    File "/usr/lib/python2.6/site-packages/vdsm/tool/configurators/
        sanlock.py", line 87, in isconfigured
    .strip().split(" ")]
    ValueError: invalid literal for int() with base 10: ''

Which happens when sanlock "Groups:" line is empty:

    $ grep "Groups:" /proc/<sanlock pid>/status
    Groups:

Sanlock must have its groups properly setup, but we should not
blow up because of this.

Fixed by using split() instead of split(' '), which cannot handle empty
string and is the wrong way to split in most cases.

Change-Id: I47f080beb748353970dec0753c9a0a7b1dd09bc6
Bug-Url: https://bugzilla.redhat.com/1269886
Backport-To: 3.6
Backport-To: 3.5
Signed-off-by: Germano Veit Michel <germano at redhat.com>
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/46742
Reviewed-by: Francesco Romani <fromani at redhat.com>
Continuous-Integration: Dan Kenigsberg <danken at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/47105
Reviewed-by: Allon Mureinik <amureini at redhat.com>
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
Continuous-Integration: Francesco Romani <fromani at redhat.com>
---
M lib/vdsm/tool/configurators/sanlock.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Nir Soffer: Verified
  Dan Kenigsberg: Looks good to me, approved
  Allon Mureinik: Looks good to me, but someone else must approve
  Francesco Romani: Looks good to me, approved; Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/47105
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I47f080beb748353970dec0753c9a0a7b1dd09bc6
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: David Caro <dcaroest at redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri at redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani at redhat.com>
Gerrit-Reviewer: Germano Veit Michel <germano at redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: automation at ovirt.org


More information about the vdsm-patches mailing list