On Fri, Aug 12, 2016 at 07:13:32AM +0200, Kristoffer Grönlund wrote: > Dejan Muhamedagic <[email protected]> writes: > > > Hi Kristoffer, > > > > On Wed, Aug 10, 2016 at 12:32:48PM +0200, Kristoffer Grönlund wrote: > >> > >> Hi everyone (Lars and Dejan in particular), > >> > >> Here are some minor patches for cluster-glue. The first one is an > >> attempt to get the stonith man page somewhat up to date, and the other > >> two are minor issues discovered when compiling cluster-glue using GCC > >> 6. > > > > Pushed just now the man page patch which was pending in my queue. > > Will apply the other two too. > > > > Thanks for the contribution! > > Excellent, thank you!
Apparently, the patches as they are cannot be imported with "hg import", i.e. the metadata gets lost. Did you do "hg export"? Can you supply them with "hg export"? Cheers, Dejan > Cheers, > Kristoffer > > > > > Cheers, > > > > Dejan > > > >> > >> Cheers, > >> Kristoffer > >> > >> -- > >> // Kristoffer Grönlund > >> // [email protected] > >> > > > > > > > >> changeset: 2820:13875518ed6b > >> parent: 2815:643ac28499bd > >> user: Kristoffer Grönlund <[email protected]> > >> date: Wed Aug 10 12:13:13 2016 +0200 > >> files: doc/stonith.xml.in > >> description: > >> Low: stonith: Update man page with -E, -m parameters (bsc#970307) > >> > >> > >> diff --git a/doc/stonith.xml.in b/doc/stonith.xml.in > >> --- a/doc/stonith.xml.in > >> +++ b/doc/stonith.xml.in > >> @@ -7,22 +7,28 @@ > >> <productnumber>@VERSION@</productnumber> > >> <authorgroup> > >> <author> > >> - <firstname>Alan</firstname> > >> - <surname>Robertson</surname> > >> - <contrib>stonith</contrib> > >> - <email>[email protected]</email> > >> + <firstname>Alan</firstname> > >> + <surname>Robertson</surname> > >> + <contrib>stonith</contrib> > >> + <email>[email protected]</email> > >> </author> > >> <author> > >> - <firstname>Simon</firstname> > >> - <surname>Horman</surname> > >> - <contrib>man page</contrib> > >> - <email>[email protected]</email> > >> + <firstname>Simon</firstname> > >> + <surname>Horman</surname> > >> + <contrib>man page</contrib> > >> + <email>[email protected]</email> > >> </author> > >> <author> > >> - <firstname>Florian</firstname> > >> - <surname>Haas</surname> > >> - <contrib>man page</contrib> > >> - <email>[email protected]</email> > >> + <firstname>Florian</firstname> > >> + <surname>Haas</surname> > >> + <contrib>man page</contrib> > >> + <email>[email protected]</email> > >> + </author> > >> + <author> > >> + <firstname>Kristoffer</firstname> > >> + <surname>Gronlund</surname> > >> + <contrib>man page</contrib> > >> + <email>[email protected]</email> > >> </author> > >> </authorgroup> > >> </refentryinfo> > >> @@ -44,12 +50,14 @@ > >> <cmdsynopsis> > >> <command>stonith</command> > >> <arg choice="opt"><option>-s</option></arg> > >> + <arg choice="opt"><option>-v</option></arg> > >> <arg choice="opt"><option>-h</option></arg> > >> <arg choice="plain"><option>-L</option></arg> > >> </cmdsynopsis> > >> <cmdsynopsis> > >> <command>stonith</command> > >> <arg choice="opt"><option>-s</option></arg> > >> + <arg choice="opt"><option>-v</option></arg> > >> <arg choice="opt"><option>-h</option></arg> > >> <arg choice="plain"><option>-t</option> > >> <replaceable>stonith-device-type</replaceable></arg> > >> <arg choice="plain"><option>-n</option></arg> > >> @@ -57,14 +65,24 @@ > >> <cmdsynopsis> > >> <command>stonith</command> > >> <arg choice="opt"><option>-s</option></arg> > >> + <arg choice="opt"><option>-v</option></arg> > >> + <arg choice="opt"><option>-h</option></arg> > >> + <arg choice="plain"><option>-t</option> > >> <replaceable>stonith-device-type</replaceable></arg> > >> + <arg choice="plain"><option>-m</option></arg> > >> + </cmdsynopsis> > >> + <cmdsynopsis> > >> + <command>stonith</command> > >> + <arg choice="opt"><option>-s</option></arg> > >> + <arg choice="opt"><option>-v</option></arg> > >> <arg choice="opt"><option>-h</option></arg> > >> <arg choice="plain"><option>-t</option> > >> <replaceable>stonith-device-type</replaceable></arg> > >> <group choice="req" rep="norepeat"> > >> - <group choice="plain" rep="repeat"> > >> - <arg > >> choice="plain"><replaceable>name</replaceable>=<replaceable>value</replaceable></arg> > >> - </group> > >> - <arg choice="plain"><option>-p</option> > >> <replaceable>stonith-device-parameters</replaceable></arg> > >> - <arg choice="plain"><option>-F</option> > >> <replaceable>stonith-device-parameters-file</replaceable></arg> > >> + <group choice="plain" rep="repeat"> > >> + <arg > >> choice="plain"><replaceable>name</replaceable>=<replaceable>value</replaceable></arg> > >> + </group> > >> + <arg choice="plain"><option>-p</option> > >> <replaceable>stonith-device-parameters</replaceable></arg> > >> + <arg choice="plain"><option>-E</option></arg> > >> + <arg choice="plain"><option>-F</option> > >> <replaceable>stonith-device-parameters-file</replaceable></arg> > >> </group> > >> <arg choice="opt"><option>-c</option> > >> <replaceable>count</replaceable></arg> > >> <arg choice="opt"><option>-l</option></arg> > >> @@ -73,22 +91,24 @@ > >> <cmdsynopsis> > >> <command>stonith</command> > >> <arg choice="opt"><option>-s</option></arg> > >> + <arg choice="opt"><option>-v</option></arg> > >> <arg choice="opt"><option>-h</option></arg> > >> <arg choice="plain"><option>-t</option> > >> <replaceable>stonith-device-type</replaceable></arg> > >> <group choice="req" rep="norepeat"> > >> - <group choice="plain" rep="repeat"> > >> - <arg > >> choice="plain"><replaceable>name</replaceable>=<replaceable>value</replaceable></arg> > >> - </group> > >> - <arg choice="plain"><option>-p</option> > >> <replaceable>stonith-device-parameters</replaceable></arg> > >> - <arg choice="plain"><option>-F</option> > >> <replaceable>stonith-device-parameters-file</replaceable></arg> > >> + <group choice="plain" rep="repeat"> > >> + <arg > >> choice="plain"><replaceable>name</replaceable>=<replaceable>value</replaceable></arg> > >> + </group> > >> + <arg choice="plain"><option>-p</option> > >> <replaceable>stonith-device-parameters</replaceable></arg> > >> + <arg choice="plain"><option>-E</option></arg> > >> + <arg choice="plain"><option>-F</option> > >> <replaceable>stonith-device-parameters-file</replaceable></arg> > >> </group> > >> <arg choice="opt"><option>-c</option> > >> <replaceable>count</replaceable></arg> > >> <arg choice="opt"><option>-T</option> > >> <group choice="req"> > >> - <arg choice="plain">reset</arg> > >> - <arg choice="plain">on</arg> > >> - <arg choice="plain">off</arg> > >> - </group> > >> + <arg choice="plain">reset</arg> > >> + <arg choice="plain">on</arg> > >> + <arg choice="plain">off</arg> > >> + </group> > >> </arg> > >> <arg><replaceable>nodename</replaceable></arg> > >> </cmdsynopsis> > >> @@ -108,145 +128,161 @@ > >> <para>The following options are supported:</para> > >> <variablelist> > >> <varlistentry> > >> - <term> > >> - <option>-c</option> <replaceable>count</replaceable> > >> - </term> > >> - <listitem> > >> - <para>Perform any actions identified by the > >> - <option>-l</option>, <option>-S</option> and > >> - <option>-T</option> options <replaceable>count</replaceable> > >> - times.</para> > >> - </listitem> > >> - </varlistentry> > >> - <varlistentry> > >> - <term> > >> - <option>-F</option> > >> <replaceable>stonith-device-parameters-file</replaceable> > >> - </term> > >> - <listitem> > >> - <para>Path of file specifying parameters for a stonith > >> - device. To determine the syntax of the parameters file for a > >> - given device type run:</para> > >> - <screen><computeroutput># </computeroutput><userinput>stonith -t > >> stonith-device-type -n</userinput></screen> > >> - <para>All of the listed parameters need to appear in order > >> - on a single line in the parameters file and be delimited by > >> - whitespace.</para> > >> - </listitem> > >> - </varlistentry> > >> - <varlistentry> > >> - <term> > >> - <option>-h</option> > >> - </term> > >> - <listitem> > >> - <para>Display detailed information about a stonith device > >> - including description, configuration information, parameters > >> - and any other related information. When specified without a > >> - stonith-device-type, detailed information on all stonith > >> - devices is displayed.</para> > >> - <para>If you don't yet own a stonith device and want to know > >> - more about the ones we support, this information is likely > >> - to be helpful.</para> > >> - </listitem> > >> - </varlistentry> > >> - <varlistentry> > >> - <term> > >> - <option>-L</option> > >> - </term> > >> - <listitem> > >> - <para>List the valid stonith device types, suitable for > >> - passing as an argument to the <option>-t</option> > >> - option.</para> > >> - </listitem> > >> - </varlistentry> > >> - <varlistentry> > >> - <term> > >> - <option>-l</option> > >> - </term> > >> - <listitem> > >> - <para>List the hosts controlled by the stonith device.</para> > >> - </listitem> > >> - </varlistentry> > >> - <varlistentry> > >> - <term> > >> - <option>-n</option> > >> - </term> > >> - <listitem> > >> - <para>Output the parameter names of the stonith device.</para> > >> - </listitem> > >> + <term> > >> + <option>-c</option> <replaceable>count</replaceable> > >> + </term> > >> + <listitem> > >> + <para>Perform any actions identified by the > >> + <option>-l</option>, <option>-S</option> and > >> + <option>-T</option> options <replaceable>count</replaceable> > >> + times.</para> > >> + </listitem> > >> </varlistentry> > >> <varlistentry> > >> - <term> > >> - <replaceable>name</replaceable>=<replaceable>value</replaceable> > >> - </term> > >> - <listitem> > >> - <para>Parameter, in the form of a name/value pair, to pass > >> - directly to the stonith device. To determine the syntax of > >> - the parameters for a given device type run:</para> > >> - <screen><computeroutput># </computeroutput><userinput>stonith -t > >> stonith-device-type -n</userinput></screen> > >> - <para>All of the listed parameter names need to be passed > >> - with their corresponding values.</para> > >> - </listitem> > >> - </varlistentry> > >> - <varlistentry> > >> - <term> > >> - <option>-p</option> > >> <replaceable>stonith-device-parameters</replaceable> > >> - </term> > >> - <listitem> > >> - <para>Parameters to pass directly to the stonith device. To > >> - determine the syntax of the parameters for a given device > >> - type run:</para> > >> - <screen><computeroutput># </computeroutput><userinput>stonith -t > >> stonith-device-type -n</userinput></screen> > >> - <para>All of the listed parameter names need to appear in > >> - order and be delimited by whitespace.</para> > >> - </listitem> > >> - </varlistentry> > >> - <varlistentry> > >> - <term> > >> - <option>-S</option> > >> - </term> > >> - <listitem> > >> - <para>Show the status of the stonith device.</para> > >> - </listitem> > >> + <term> > >> + <option>-E</option> > >> + </term> > >> + <listitem> > >> + <para>Get parameters from the environment.</para> > >> + </listitem> > >> </varlistentry> > >> <varlistentry> > >> - <term> > >> - <option>-s</option> > >> - </term> > >> - <listitem> > >> - <para>Silent operation. Suppress logging of error messages to > >> standard error.</para> > >> - </listitem> > >> + <term> > >> + <option>-F</option> > >> <replaceable>stonith-device-parameters-file</replaceable> > >> + </term> > >> + <listitem> > >> + <para>Path of file specifying parameters for a stonith > >> + device. To determine the syntax of the parameters file for a > >> + given device type run:</para> > >> + <screen><computeroutput># </computeroutput><userinput>stonith > >> -t stonith-device-type -n</userinput></screen> > >> + <para>All of the listed parameters need to appear in order > >> + on a single line in the parameters file and be delimited by > >> + whitespace.</para> > >> + </listitem> > >> </varlistentry> > >> <varlistentry> > >> - <term> > >> - <option>-T</option> <replaceable>action</replaceable> > >> - </term> > >> - <listitem> > >> - <para>The stonith action to perform on the node identified > >> - by nodename. Chosen from <token>reset</token>, > >> - <token>on</token>, and <token>off</token>.</para> > >> - <note> > >> - <para>If a nodename is specified without the > >> - <option>-T</option> option, the stonith action defaults to > >> - <token>reset</token>.</para> > >> - </note> > >> - </listitem> > >> + <term> > >> + <option>-h</option> > >> + </term> > >> + <listitem> > >> + <para>Display detailed information about a stonith device > >> + including description, configuration information, parameters > >> + and any other related information. When specified without a > >> + stonith-device-type, detailed information on all stonith > >> + devices is displayed.</para> > >> + <para>If you don't yet own a stonith device and want to know > >> + more about the ones we support, this information is likely > >> + to be helpful.</para> > >> + </listitem> > >> </varlistentry> > >> <varlistentry> > >> - <term> > >> - <option>-t</option> <replaceable>stonith-device-type</replaceable> > >> - </term> > >> - <listitem> > >> - <para>The type of the stonith device to be used to effect > >> - stonith. A list of supported devices for an installation may > >> - be obtained using the <option>-L</option> option.</para> > >> - </listitem> > >> + <term> > >> + <option>-L</option> > >> + </term> > >> + <listitem> > >> + <para>List the valid stonith device types, suitable for > >> + passing as an argument to the <option>-t</option> > >> + option.</para> > >> + </listitem> > >> </varlistentry> > >> <varlistentry> > >> - <term> > >> - <option>-v</option> > >> - </term> > >> - <listitem> > >> - <para>Ignored.</para> > >> - </listitem> > >> + <term> > >> + <option>-l</option> > >> + </term> > >> + <listitem> > >> + <para>List the hosts controlled by the stonith device.</para> > >> + </listitem> > >> + </varlistentry> > >> + <varlistentry> > >> + <term> > >> + <option>-n</option> > >> + </term> > >> + <listitem> > >> + <para>Output the parameter names of the stonith device.</para> > >> + </listitem> > >> + </varlistentry> > >> + <varlistentry> > >> + <term> > >> + <option>-m</option> > >> + </term> > >> + <listitem> > >> + <para>Display meta-data of the stonith device type.</para> > >> + </listitem> > >> + </varlistentry> > >> + <varlistentry> > >> + <term> > >> + <replaceable>name</replaceable>=<replaceable>value</replaceable> > >> + </term> > >> + <listitem> > >> + <para>Parameter, in the form of a name/value pair, to pass > >> + directly to the stonith device. To determine the syntax of > >> + the parameters for a given device type run:</para> > >> + <screen><computeroutput># </computeroutput><userinput>stonith > >> -t stonith-device-type -n</userinput></screen> > >> + <para>All of the listed parameter names need to be passed > >> + with their corresponding values.</para> > >> + </listitem> > >> + </varlistentry> > >> + <varlistentry> > >> + <term> > >> + <option>-p</option> > >> <replaceable>stonith-device-parameters</replaceable> > >> + </term> > >> + <listitem> > >> + <para>Parameters to pass directly to the stonith device. To > >> + determine the syntax of the parameters for a given device > >> + type run:</para> > >> + <screen><computeroutput># </computeroutput><userinput>stonith > >> -t stonith-device-type -n</userinput></screen> > >> + <para>All of the listed parameter names need to appear in > >> + order and be delimited by whitespace.</para> > >> + </listitem> > >> + </varlistentry> > >> + <varlistentry> > >> + <term> > >> + <option>-S</option> > >> + </term> > >> + <listitem> > >> + <para>Show the status of the stonith device.</para> > >> + </listitem> > >> + </varlistentry> > >> + <varlistentry> > >> + <term> > >> + <option>-s</option> > >> + </term> > >> + <listitem> > >> + <para>Silent operation. Suppress logging of error messages to > >> standard error.</para> > >> + </listitem> > >> + </varlistentry> > >> + <varlistentry> > >> + <term> > >> + <option>-T</option> <replaceable>action</replaceable> > >> + </term> > >> + <listitem> > >> + <para>The stonith action to perform on the node identified > >> + by nodename. Chosen from <token>reset</token>, > >> + <token>on</token>, and <token>off</token>.</para> > >> + <note> > >> + <para>If a nodename is specified without the > >> + <option>-T</option> option, the stonith action defaults to > >> + <token>reset</token>.</para> > >> + </note> > >> + </listitem> > >> + </varlistentry> > >> + <varlistentry> > >> + <term> > >> + <option>-t</option> > >> <replaceable>stonith-device-type</replaceable> > >> + </term> > >> + <listitem> > >> + <para>The type of the stonith device to be used to effect > >> + stonith. A list of supported devices for an installation may > >> + be obtained using the <option>-L</option> option.</para> > >> + </listitem> > >> + </varlistentry> > >> + <varlistentry> > >> + <term> > >> + <option>-v</option> > >> + </term> > >> + <listitem> > >> + <para>Ignored.</para> > >> + </listitem> > >> </varlistentry> > >> </variablelist> > >> </refsection> > >> > > > >> changeset: 2821:f44088ebf874 > >> user: Kristoffer Grönlund <[email protected]> > >> date: Wed Aug 10 12:15:08 2016 +0200 > >> files: lib/clplumbing/cl_msg.c > >> description: > >> Low: clplumbing: Remove incorrect negation of n > >> > >> > >> diff --git a/lib/clplumbing/cl_msg.c b/lib/clplumbing/cl_msg.c > >> --- a/lib/clplumbing/cl_msg.c > >> +++ b/lib/clplumbing/cl_msg.c > >> @@ -1344,7 +1344,7 @@ cl_msg_add_list_str(struct ha_msg* msg, > >> if (n <= 0 || buf == NULL|| name ==NULL ||msg == NULL){ > >> cl_log(LOG_ERR, "%s:" > >> "invalid parameter(%s)", > >> - !n <= 0?"n is negative or zero": > >> + n <= 0?"n is negative or zero": > >> !buf?"buf is NULL": > >> !name?"name is NULL": > >> "msg is NULL",__FUNCTION__); > >> @@ -1397,7 +1397,7 @@ cl_msg_add_list_int(struct ha_msg* msg, > >> if (n <= 0 || buf == NULL|| name ==NULL ||msg == NULL){ > >> cl_log(LOG_ERR, "cl_msg_add_list_int:" > >> "invalid parameter(%s)", > >> - !n <= 0?"n is negative or zero": > >> + n <= 0?"n is negative or zero": > >> !buf?"buf is NULL": > >> !name?"name is NULL": > >> "msg is NULL"); > >> > > > >> changeset: 2822:aeadfcd8425a > >> tag: tip > >> user: Kristoffer Grönlund <[email protected]> > >> date: Wed Aug 10 12:17:17 2016 +0200 > >> files: logd/ha_logd.c > >> description: > >> Dev: ha_logd: Remove unused variables > >> > >> > >> diff --git a/logd/ha_logd.c b/logd/ha_logd.c > >> --- a/logd/ha_logd.c > >> +++ b/logd/ha_logd.c > >> @@ -75,9 +75,6 @@ > >> #define EOS '\0' > >> #define nullchk(a) ((a) ? (a) : "<null>") > >> > >> -static const int logd_keepalive_ms = 1000; > >> -static const int logd_warntime_ms = 5000; > >> -static const int logd_deadtime_ms = 10000; > >> static gboolean verbose = FALSE; > >> static pid_t write_process_pid; > >> static IPC_Channel *chanspair[2]; > >> > > > > > > -- > // Kristoffer Grönlund > // [email protected] _______________________________________________________ Linux-HA-Dev: [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
