On Tue, Feb 12, 2013 at 12:31 PM, Guido Trotter <[email protected]> wrote: > On Fri, Feb 8, 2013 at 5:36 PM, Stratos Psomadakis <[email protected]> wrote: >> 'rbd showmapped' output formatting differs between older and newer versions >> of >> the ceph tools. Try to use json output formatting if available (currently >> available only in the ceph master branch). For bobtail, argonaut and older >> releases fallback to manually parsing the 'rbd showmapped' output, handling >> the >> differences in the output format for each rbd version correctly. >> >> Signed-off-by: Stratos Psomadakis <[email protected]> > > LGTM >
Interdiff to make "lint" happy diff --git a/lib/bdev.py b/lib/bdev.py index 5f63c2a..080880c 100644 --- a/lib/bdev.py +++ b/lib/bdev.py @@ -44,12 +44,14 @@ from ganeti import serializer # Size of reads in _CanReadDevice _DEVICE_READ_SIZE = 128 * 1024 + class RbdShowmappedJsonError(Exception): """`rbd showmmapped' JSON formatting error Exception class. """ pass + def _IgnoreError(fn, *args, **kwargs): """Executes the given function, ignoring BlockDeviceErrors.
