From 5f01e6ad1d859fc2342554919765817c634ea925 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 22 Aug 2011 17:44:11 +0200
Subject: [PATCH] watcher: Wait for child processes by default
This patch retains the behaviour of ganeti-watcher in previous Ganeti
versions.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/watcher/__init__.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index a305fe479..323283b5b 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -363,8 +363,12 @@ def ParseOptions():
" 6 hours)")
parser.add_option("--ignore-pause", dest="ignore_pause", default=False,
action="store_true", help="Ignore cluster pause setting")
- parser.add_option("--wait-children", dest="wait_children", default=False,
+ parser.add_option("--wait-children", dest="wait_children",
action="store_true", help="Wait for child processes")
+ parser.add_option("--no-wait-children", dest="wait_children",
+ action="store_false", help="Don't wait for child processes")
+ # See optparse documentation for why default values are not set by options
+ parser.set_defaults(wait_children=True)
options, args = parser.parse_args()
options.job_age = cli.ParseTimespec(options.job_age)
--
GitLab