LGTM, thanks!
On Tuesday, August 16, 2016 at 2:06:44 PM UTC+1, Brian Foley wrote: > > commit a98bd0ea60e7586b2dc351d859869025f1815398 > Merge: dadafed 3b5c416 > Author: Brian Foley <bpfo...@google.com> > Date: Tue Aug 16 14:04:32 2016 +0100 > > Merge branch 'stable-2.17' > > * stable-2.17 > Introduce a non-strict flag for group verify disk > > * stable-2.16 > Improve error reporting in _VerifyClientCertificates > Simplify some inscrutable map/map/ifilter/zip code > Avoid overuse of operator in watcher *.py > Sprinkle some more list comprehensions > Replace map/partial with list comprehension > Replace uses of map/lambda with more Pythonic code > Replace map(operator.attrgetter, ...) uses > Fix typos in gnt-cluster man page > Hide errors for expected inotify failures in unittest > Add gnt-instance rename --force option > Improve documentation for gnt-instance failover > Allow master failover to ignore offline nodes > Fix LogicalVolume code to work with older /sbin/lvs > Shorten verifyMasterVote failure message > Adding a confirmation before gnt-node --offline no > Removed unnecessary dependency from rpc in cli > Refactor cli exception to its appropriate module > Clean-up of code and fix of pylint warnings > Use fork instead of spawnv in the watcher > Make 'make pep8' happy > > Manually fix conflicts in lib/errors.py > > Signed-off-by: Brian Foley <bpfo...@google.com> > > diff --cc lib/client/gnt_cluster.py > index 00d5a46,2cc8328..7c575c0 > --- a/lib/client/gnt_cluster.py > +++ b/lib/client/gnt_cluster.py > @@@ -2515,10 -2523,11 +2523,10 @@@ commands = > "verify": ( > VerifyCluster, ARGS_NONE, > [VERBOSE_OPT, DEBUG_SIMERR_OPT, ERROR_CODES_OPT, NONPLUS1_OPT, > - DRY_RUN_OPT, PRIORITY_OPT, NODEGROUP_OPT, IGNORE_ERRORS_OPT, > - VERIFY_CLUTTER_OPT], > + PRIORITY_OPT, NODEGROUP_OPT, IGNORE_ERRORS_OPT, > VERIFY_CLUTTER_OPT], > "", "Does a check on the cluster configuration"), > "verify-disks": ( > - VerifyDisks, ARGS_NONE, [PRIORITY_OPT, NODEGROUP_OPT], > + VerifyDisks, ARGS_NONE, [PRIORITY_OPT, NODEGROUP_OPT, STRICT_OPT], > "", "Does a check on the cluster disk status"), > "repair-disk-sizes": ( > RepairDiskSizes, ARGS_MANY_INSTANCES, [DRY_RUN_OPT, PRIORITY_OPT], > diff --cc lib/errors.py > index 048b377,826e761..5fb885b > --- a/lib/errors.py > +++ b/lib/errors.py > @@@ -469,12 -469,17 +469,22 @@@ class SshUpdateError(GenericError) > """ > > > +class PamRapiAuthError(GenericError): > + """Error in PAM remote API authenticator initialization. > + > + """ > + > + > + class JobSubmittedException(Exception): > + """Job was submitted, client should exit. > + > + This exception has one argument, the ID of the job that was > + submitted. The handler should print this ID. > + > + This is not an error, just a structured way to exit from clients. > - > + """ > + > + > # errors should be added above > > >
