[Ocfs2-tools-devel] [PATCH 2/3] ocfs2_controld.pcmk: Fill in our_nodeid

[Joel Becker]

On Thu, Aug 21, 2008 at 10:14:32AM -0700, Mark Fasheh wrote:
> We were never filling in our_nodeid, which needs to correspond to the local
> nodeid value. Instead, it was left at '0' - the value for invalid node id!
> 
> Signed-off-by: Andrew Beekhof <abeekhof at suse.de>
> Signed-off-by: Mark Fasheh <mfasheh at suse.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>

Is that the crm/*.h API?  'get_ais_nodeid()' sure wants a namespace...
:-)  But that's not related to this patch.


> ---
>  ocfs2_controld/pacemaker.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/ocfs2_controld/pacemaker.c b/ocfs2_controld/pacemaker.c
> index a47dc0e..eaa861a 100644
> --- a/ocfs2_controld/pacemaker.c
> +++ b/ocfs2_controld/pacemaker.c
> @@ -296,6 +296,9 @@ retry:
>  	/* Requesting the current list of known nodes */
>  	send_ais_text(crm_class_members, __FUNCTION__, TRUE, NULL, crm_msg_ais);
>  
> +	our_nodeid = get_ais_nodeid();
> +	log_debug("Local node id: %d", our_nodeid);
> +
>  	pcmk_ci = connection_add(ais_fd_async, process_pcmk, dead_pcmk);
>  	if (pcmk_ci >= 0)
>  		return ais_fd_async;
> -- 
> 1.5.4.1
> 
> 
> _______________________________________________
> Ocfs2-tools-devel mailing list
> Ocfs2-tools-devel at oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-tools-devel

-- 

"Against stupidity the Gods themselves contend in vain."
	- Friedrich von Schiller

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127