LGTM On Tue, Jun 30, 2009 at 6:01 PM, Iustin Pop<[email protected]> wrote: > > If the config file is missing when the DemoteFromMC() function is > called, it will raise a ProgrammerError. Instead of changing the > utils.CreateBackup() file which is called from multiple places, for now > we only change the DemoteFromMC() function to not call it if the file is > not existing (we rely on the master to prevent race conditions here). > --- > lib/backend.py | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/lib/backend.py b/lib/backend.py > index d438f1a..bca3512 100644 > --- a/lib/backend.py > +++ b/lib/backend.py > @@ -2308,7 +2308,8 @@ def DemoteFromMC(): > if utils.IsProcessAlive(utils.ReadPidFile(pid_file)): > return (False, "The master daemon is running, will not demote") > try: > - utils.CreateBackup(constants.CLUSTER_CONF_FILE) > + if os.path.isfile(constants.CLUSTER_CONF_FILE): > + utils.CreateBackup(constants.CLUSTER_CONF_FILE) > except EnvironmentError, err: > if err.errno != errno.ENOENT: > return (False, "Error while backing up cluster file: %s" % str(err)) > -- > 1.6.3.3 > >
-- olive
