BIND 10 trac1340, updated. 181926059b0162e09c30b4b967b09294d713918e [1342] Remove the --brittle switch
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Nov 16 15:32:54 UTC 2011
The branch, trac1340 has been updated
via 181926059b0162e09c30b4b967b09294d713918e (commit)
from 120946aa30b22c36995135b7d5bfcade4c26e192 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 181926059b0162e09c30b4b967b09294d713918e
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Wed Nov 16 16:31:51 2011 +0100
[1342] Remove the --brittle switch
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/bind10.xml | 15 ------------
src/bin/bind10/bind10_src.py.in | 10 +------
src/bin/bind10/tests/bind10_test.py.in | 40 --------------------------------
3 files changed, 2 insertions(+), 63 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10.xml b/src/bin/bind10/bind10.xml
index 6de0947..340a2bb 100644
--- a/src/bin/bind10/bind10.xml
+++ b/src/bin/bind10/bind10.xml
@@ -51,7 +51,6 @@
<arg><option>-u <replaceable>user</replaceable></option></arg>
<arg><option>-v</option></arg>
<arg><option>-w <replaceable>wait_time</replaceable></option></arg>
- <arg><option>--brittle</option></arg>
<arg><option>--cmdctl-port</option> <replaceable>port</replaceable></arg>
<arg><option>--config-file</option> <replaceable>config-filename</replaceable></arg>
<arg><option>--data-path</option> <replaceable>directory</replaceable></arg>
@@ -92,20 +91,6 @@
<varlistentry>
<term>
- <option>--brittle</option>
- </term>
- <listitem>
- <para>
- Shutdown if any of the child processes of
- <command>bind10</command> exit. This is intended to
- help developers debug the server, and should not be
- used in production.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>
<option>-c</option> <replaceable>config-filename</replaceable>,
<option>--config-file</option> <replaceable>config-filename</replaceable>
</term>
diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index cbbaff5..68ff97b 100755
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -219,7 +219,7 @@ class BoB:
def __init__(self, msgq_socket_file=None, data_path=None,
config_filename=None, nocache=False, verbose=False, setuid=None,
- username=None, cmdctl_port=None, brittle=False, wait_time=10):
+ username=None, cmdctl_port=None, wait_time=10):
"""
Initialize the Boss of BIND. This is a singleton (only one can run).
@@ -233,9 +233,6 @@ class BoB:
The cmdctl_port is passed to cmdctl and specify on which port it
should listen.
- brittle is a debug option that controls whether the Boss shuts down
- after any process dies.
-
wait_time controls the amount of time (in seconds) that Boss waits
for selected processes to initialize before continuing with the
initialization. Currently this is only the configuration manager.
@@ -264,7 +261,6 @@ class BoB:
self.data_path = data_path
self.config_filename = config_filename
self.cmdctl_port = cmdctl_port
- self.brittle = brittle
self.wait_time = wait_time
self._component_configurator = isc.bind10.component.Configurator(self,
isc.bind10.special_component.get_specials())
@@ -940,8 +936,6 @@ def parse_args(args=sys.argv[1:], Parser=OptionParser):
parser.add_option("--pid-file", dest="pid_file", type="string",
default=None,
help="file to dump the PID of the BIND 10 process")
- parser.add_option("--brittle", dest="brittle", action="store_true",
- help="debugging flag: exit if any component dies")
parser.add_option("-w", "--wait", dest="wait_time", type="int",
default=10, help="Time (in seconds) to wait for config manager to start up")
@@ -1046,7 +1040,7 @@ def main():
# Go bob!
boss_of_bind = BoB(options.msgq_socket_file, options.data_path,
options.config_file, options.nocache, options.verbose,
- setuid, username, options.cmdctl_port, options.brittle,
+ setuid, username, options.cmdctl_port,
options.wait_time)
startup_result = boss_of_bind.startup()
if startup_result:
diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index b238482..e323113 100644
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -740,15 +740,6 @@ class TestParseArgs(unittest.TestCase):
options = parse_args(['--cmdctl-port=1234'], TestOptParser)
self.assertEqual(1234, options.cmdctl_port)
- def test_brittle(self):
- """
- Test we can use the "brittle" flag.
- """
- options = parse_args([], TestOptParser)
- self.assertFalse(options.brittle)
- options = parse_args(['--brittle'], TestOptParser)
- self.assertTrue(options.brittle)
-
class TestPIDFile(unittest.TestCase):
def setUp(self):
self.pid_file = '@builddir@' + os.sep + 'bind10.pid'
@@ -796,37 +787,6 @@ class TestPIDFile(unittest.TestCase):
self.assertRaises(IOError, dump_pid,
'nonexistent_dir' + os.sep + 'bind10.pid')
-# TODO: Do we want brittle mode? Probably yes. So we need to re-enable to after that.
- at unittest.skip("Brittle mode temporarily broken")
-class TestBrittle(unittest.TestCase):
- def test_brittle_disabled(self):
- bob = MockBob()
- bob.start_all_components()
- bob.runnable = True
-
- bob.reap_children()
- self.assertTrue(bob.runnable)
-
- def simulated_exit(self):
- ret_val = self.exit_info
- self.exit_info = (0, 0)
- return ret_val
-
- def test_brittle_enabled(self):
- bob = MockBob()
- bob.start_all_components()
- bob.runnable = True
-
- bob.brittle = True
- self.exit_info = (5, 0)
- bob._get_process_exit_status = self.simulated_exit
-
- old_stdout = sys.stdout
- sys.stdout = open("/dev/null", "w")
- bob.reap_children()
- sys.stdout = old_stdout
- self.assertFalse(bob.runnable)
-
class TestBossComponents(unittest.TestCase):
"""
Test the boss propagates component configuration properly to the
More information about the bind10-changes
mailing list