BIND 10 trac1271, updated. a0e6002f56e624a7cbb48fb06d4ddbc612e315bd [1271] Updated the documentation for the changes
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Oct 26 13:15:13 UTC 2011
The branch, trac1271 has been updated
via a0e6002f56e624a7cbb48fb06d4ddbc612e315bd (commit)
from c3385a5449721914b56448705cae8af449e6d337 (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 a0e6002f56e624a7cbb48fb06d4ddbc612e315bd
Author: Stephen Morris <stephen at isc.org>
Date: Wed Oct 26 14:14:38 2011 +0100
[1271] Updated the documentation for the changes
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/bind10.8 | 16 +++++++++++++++-
src/bin/bind10/bind10.xml | 14 ++++++++++++++
src/bin/bind10/bind10_src.py.in | 25 ++++++++++++++++---------
3 files changed, 45 insertions(+), 10 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10.8 b/src/bin/bind10/bind10.8
index 1af4f14..0adcb70 100644
--- a/src/bin/bind10/bind10.8
+++ b/src/bin/bind10/bind10.8
@@ -9,6 +9,15 @@
.\"
.TH "BIND10" "8" "August 11, 2011" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
@@ -22,7 +31,7 @@
bind10 \- BIND 10 boss process
.SH "SYNOPSIS"
.HP \w'\fBbind10\fR\ 'u
-\fBbind10\fR [\fB\-c\ \fR\fB\fIconfig\-filename\fR\fR] [\fB\-m\ \fR\fB\fIfile\fR\fR] [\fB\-n\fR] [\fB\-p\ \fR\fB\fIdata_path\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] [\fB\-v\fR] [\fB\-\-brittle\fR] [\fB\-\-cmdctl\-port\fR\ \fIport\fR] [\fB\-\-config\-file\fR\ \fIconfig\-filename\fR] [\fB\-\-data\-path\fR\ \fIdirectory\fR] [\fB\-\-msgq\-socket\-file\ \fR\fB\fIfile\fR\fR] [\fB\-\-no\-cache\fR] [\fB\-\-pid\-file\fR\ \fIfilename\fR] [\fB\-\-pretty\-name\ \fR\fB\fIname\fR\fR] [\fB\-\-user\ \fR\fB\fIuser\fR\fR] [\fB\-\-verbose\fR]
+\fBbind10\fR [\fB\-c\ \fR\fB\fIconfig\-filename\fR\fR] [\fB\-m\ \fR\fB\fIfile\fR\fR] [\fB\-n\fR] [\fB\-p\ \fR\fB\fIdata_path\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] [\fB\-v\fR] [\fB\-w\ \fR\fB\fIwait_time\fR\fR] [\fB\-\-brittle\fR] [\fB\-\-cmdctl\-port\fR\ \fIport\fR] [\fB\-\-config\-file\fR\ \fIconfig\-filename\fR] [\fB\-\-data\-path\fR\ \fIdirectory\fR] [\fB\-\-msgq\-socket\-file\ \fR\fB\fIfile\fR\fR] [\fB\-\-no\-cache\fR] [\fB\-\-pid\-file\fR\ \fIfilename\fR] [\fB\-\-pretty\-name\ \fR\fB\fIname\fR\fR] [\fB\-\-user\ \fR\fB\fIuser\fR\fR] [\fB\-\-verbose\fR] [\fB\-\-wait\ \fR\fB\fIwait_time\fR\fR]
.SH "DESCRIPTION"
.PP
The
@@ -107,6 +116,11 @@ Display more about what is going on for
\fBbind10\fR
and its child processes\&.
.RE
+.PP
+\fB\-w\fR \fIwait_time\fR, \fB\-\-wait\fR \fIwait_time\fR
+.RS 4
+Sets the amount of time that BIND 10 will wait for the configuration manager (a key component of BIND 10) to initialize itself before abandoning the start up and terminating with an error\&. The wait_time is specified in seconds and has a default value of 10\&.
+.RE
.SH "STATISTICS DATA"
.PP
The statistics data collected by the
diff --git a/src/bin/bind10/bind10.xml b/src/bin/bind10/bind10.xml
index b101ba8..6de0947 100644
--- a/src/bin/bind10/bind10.xml
+++ b/src/bin/bind10/bind10.xml
@@ -50,6 +50,7 @@
<arg><option>-p <replaceable>data_path</replaceable></option></arg>
<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>
@@ -60,6 +61,7 @@
<arg><option>--pretty-name <replaceable>name</replaceable></option></arg>
<arg><option>--user <replaceable>user</replaceable></option></arg>
<arg><option>--verbose</option></arg>
+ <arg><option>--wait <replaceable>wait_time</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -211,6 +213,18 @@ The default is the basename of ARG 0.
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>-w</option> <replaceable>wait_time</replaceable>, <option>--wait</option> <replaceable>wait_time</replaceable></term>
+ <listitem>
+ <para>Sets the amount of time that BIND 10 will wait for
+ the configuration manager (a key component of BIND 10) to
+ initialize itself before abandoning the start up and
+ terminating with an error. The wait_time is specified in
+ seconds and has a default value of 10.
+ </para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</refsect1>
diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index b7b218a..6f9f801 100755
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -215,7 +215,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, pwait_time=10):
+ username=None, cmdctl_port=None, brittle=False, wait_time=10):
"""
Initialize the Boss of BIND. This is a singleton (only one can run).
@@ -223,11 +223,18 @@ class BoB:
msgq process listens on. If verbose is True, then the boss reports
what it is doing.
- Data path and config filename are passed trough to config manager
+ Data path and config filename are passed through to config manager
(if provided) and specify the config file to be used.
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.
"""
self.cc_session = None
self.ccs = None
@@ -251,7 +258,7 @@ class BoB:
self.config_filename = config_filename
self.cmdctl_port = cmdctl_port
self.brittle = brittle
- self.pwait_time = pwait_time
+ self.wait_time = wait_time
self.sockcreator = None
# If -v was set, enable full debug logging.
@@ -514,9 +521,9 @@ class BoB:
self.processes[bind_cfgd.pid] = bind_cfgd
self.log_started(bind_cfgd.pid)
- # Wait for the configuration manager to start up. The amount of time
- # can be set on the command line.
- time_remaining = self.pwait_time
+ # Wait for the configuration manager to start up as subsequent initialization
+ # cannot proceed without it. The time to wait can be set on the command line.
+ time_remaining = self.wait_time
msg, env = self.cc_session.group_recvmsg()
while time_remaining > 0 and not self.process_running(msg, "ConfigManager"):
logger.debug(DBG_PROCESS, BIND10_WAIT_CFGMGR)
@@ -989,8 +996,8 @@ def parse_args(args=sys.argv[1:], Parser=OptionParser):
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="pwait_time", type="int",
- default=10, help="Time to wait for config manager to start up")
+ parser.add_option("-w", "--wait", dest="wait_time", type="int",
+ default=10, help="Time (in seconds) to wait for config manager to start up")
(options, args) = parser.parse_args(args)
@@ -1094,7 +1101,7 @@ def main():
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,
- options.pwait_time)
+ options.wait_time)
startup_result = boss_of_bind.startup()
if startup_result:
logger.fatal(BIND10_STARTUP_ERROR, startup_result)
More information about the bind10-changes
mailing list