From b74159ee903d743e2a7257e707cf9a8cd5b2a0f3 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 29 Apr 2008 07:37:10 +0000
Subject: [PATCH] Disable forking in the master daemon
This patch adds a mechanism to disable utils.RunCmd in selected
programs. This is needed in the master daemon unless we confirm
threading doesn't pose any problems.
This makes cluster init fail, but creating new trunk clusters is anyway
broken at the moment.
Reviewed-by: ultrotter
---
daemons/ganeti-masterd | 1 +
lib/utils.py | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index 24f5ccd30..8b8dc1a14 100644
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -332,6 +332,7 @@ def main():
options, args = ParseOptions()
utils.debug = options.debug
+ utils.no_fork = True
CheckMaster(options.debug)
diff --git a/lib/utils.py b/lib/utils.py
index 733ac26b2..72a2622d2 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -51,6 +51,7 @@ _locksheld = []
_re_shell_unquoted = re.compile('^[-.,=:/_+@A-Za-z0-9]+$')
debug = False
+no_fork = False
class RunResult(object):
@@ -219,6 +220,9 @@ def RunCmd(cmd):
Returns: `RunResult` instance
"""
+ if no_fork:
+ raise errors.ProgrammerError("utils.RunCmd() called with fork() disabled")
+
if isinstance(cmd, list):
cmd = [str(val) for val in cmd]
strcmd = " ".join(cmd)
--
GitLab