From a292020fc64a586637710b3e72b0fedd2e22a245 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 29 Jul 2011 15:15:00 +0200
Subject: [PATCH] cfgupgrade: Remove old watcher state file
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
tools/cfgupgrade | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 0d341c35c..487969a1c 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -127,6 +127,7 @@ def main():
options.CONFD_HMAC_KEY = options.data_dir + "/hmac.key"
options.CDS_FILE = options.data_dir + "/cluster-domain-secret"
options.SSCONF_MASTER_NODE = options.data_dir + "/ssconf_master_node"
+ options.WATCHER_STATEFILE = options.data_dir + "/watcher.data"
SetupLogging()
@@ -206,6 +207,12 @@ def main():
if not options.dry_run:
os.symlink(options.RAPI_USERS_FILE, options.RAPI_USERS_FILE_PRE24)
+ # Remove old watcher state file if it exists
+ if os.path.exists(options.WATCHER_STATEFILE):
+ logging.info("Removing watcher state file %s", options.WATCHER_STATEFILE)
+ if not options.dry_run:
+ utils.RemoveFile(options.WATCHER_STATEFILE)
+
try:
logging.info("Writing configuration file to %s", options.CONFIG_DATA_PATH)
utils.WriteFile(file_name=options.CONFIG_DATA_PATH,
--
GitLab