Reviewed-by: Steven Dake <sdake@xxxxxxxxxx> On 02/17/2012 04:59 AM, Jan Friesse wrote: > Also all irelevant references for SAM_RECOVERY_POLICY_CONFDB are > corrected. > > Signed-off-by: Jan Friesse <jfriesse@xxxxxxxxxx> > --- > man/sam_initialize.3.in | 7 +++++-- > man/sam_mark_failed.3.in | 4 ++-- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/man/sam_initialize.3.in b/man/sam_initialize.3.in > index 5a3334f..2e57904 100644 > --- a/man/sam_initialize.3.in > +++ b/man/sam_initialize.3.in > @@ -71,6 +71,7 @@ The \fIrecovery_policy\fR is defined as type: > SAM_RECOVERY_POLICY_QUORUM = 0x08, > SAM_RECOVERY_POLICY_QUORUM_QUIT = SAM_RECOVERY_POLICY_QUORUM | SAM_RECOVERY_POLICY_QUIT, > SAM_RECOVERY_POLICY_QUORUM_RESTART = SAM_RECOVERY_POLICY_QUORUM | SAM_RECOVERY_POLICY_RESTART, > + SAM_RECOVERY_POLICY_CMAP = 0x10, > SAM_RECOVERY_POLICY_CONFDB = 0x10, > } sam_recovery_policy_t; > .fi > @@ -96,8 +97,10 @@ SAM_RECOVERY_POLICY_QUORUM_RESTART > same as \fISAM_RECOVERY_POLICY_RESTART\fR but \fBsam_start (3)\fR will block until corosync becomes > quorate and process will be restarted if quorum is lost. > .TP > -SAM_RECOVERY_POLICY_CONFDB > -is not policy. Used only as flag meaning confdb integration. It can be used with all previous policies. > +SAM_RECOVERY_POLICY_CMAP > +is not policy. Used only as flag meaning cmap integration. It can be used with all previous policies. > +For backward compatibility, SAM_RECOVERY_POLICY_CONFDB with same meaning as > +\fISAM_RECOVERY_POLICY_CMAP\fR is also provided. > > .P > To perform event driven healthchecking, \fBsam_register(3)\fR and > diff --git a/man/sam_mark_failed.3.in b/man/sam_mark_failed.3.in > index dabe2da..acfb3ee 100644 > --- a/man/sam_mark_failed.3.in > +++ b/man/sam_mark_failed.3.in > @@ -46,7 +46,7 @@ sam_mark_failed \- Mark process failed > > .SH DESCRIPTION > .P > -The \fBsam_mark_failed\fR function is used with SAM_RECOVERY_POLICY_CONFDB mostly > +The \fBsam_mark_failed\fR function is used with SAM_RECOVERY_POLICY_CMAP mostly > together with SAM_RECOVERY_POLICY_RESTART to mark process failed. Process marked > failed is killed without sending warn signal and control process will exit > as with SAM_RECOVERY_POLICY_QUIT policy. Condb key state will be set to failed so > @@ -63,7 +63,7 @@ library was not initialized by calling \fBsam_initialize(3)\fR or was already fi > > .TP > CS_ERR_INVALID_PARAM > -recovery policy doesn't has SAM_RECOVERY_POLICY_CONFDB flag set > +recovery policy doesn't has SAM_RECOVERY_POLICY_CMAP flag set > > .TP > CS_ERR_LIBRARY _______________________________________________ discuss mailing list discuss@xxxxxxxxxxxx http://lists.corosync.org/mailman/listinfo/discuss
