LGTM, thanks On Thu, 2 Apr 2015 at 12:30 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> If we failed to disable the old master IP, the master failover > did not fully succeed, hence that should be reported in the > exit code. Nevertheless, the best is to proceed, as it is > better to have working cluster, albeit only reachable via > the primary IP of the new master node (and not the cluster > master IP), than not have a cluster. Also note, that for > this reason master will start up even if it cannot set > the cluster master IP. So, while there, fix the warning > message as well. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > lib/bootstrap.py | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/bootstrap.py b/lib/bootstrap.py > index e556521..2fe8196 100644 > --- a/lib/bootstrap.py > +++ b/lib/bootstrap.py > @@ -1059,10 +1059,11 @@ def MasterFailover(no_voting=False): > utils.Retry(_check_ip, (1, 1.5, 5), total_timeout) > except utils.RetryTimeout: > warning = ("The master IP is still reachable after %s seconds," > - " continuing but activating the master on the current" > + " continuing but activating the master IP on the current" > " node will probably fail" % total_timeout) > logging.warning("%s", warning) > warnings.append(warning) > + rcode = 1 > > if jstore.CheckDrainFlag(): > logging.info("Undraining job queue") > -- > 2.2.0.rc0.207.ga3a616c > >
