[Cluster-devel] cluster: RHEL6 - Apply patch from John Ruemker to resolve rhbz#803474

[Cluster-devel] cluster: RHEL6 - Apply patch from John Ruemker to resolve rhbz#803474

[Fabio M. Di Nitto]

Hi Ryan,

This patch is not upstream (STABLE32 branch) and has not been
reviewed/ack'ed for inclusion.

Commit has been reverted from the RHEL6 branch.

Please also write a more comprehensive changelog entry in the commit
because not all bugzilla's are visible to outside world.

Example:

Fix this or that by init var foo to NULL and compare blabla....

Patch from....

Resolves: rhbz#123456

Thanks
Fabio

On 04/09/2012 09:35 PM, Ryan McCabe wrote:
> Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=cd9d9be98b4276c4e73eac81563f54e92a08045d
> Commit:        cd9d9be98b4276c4e73eac81563f54e92a08045d
> Parent:        54a29913c5de797da6adb69e03b38487fef451b4
> Author:        Ryan McCabe <rmccabe@redhat.com>
> AuthorDate:    Mon Apr 9 15:34:08 2012 -0400
> Committer:     Ryan McCabe <rmccabe@redhat.com>
> CommitterDate: Mon Apr 9 15:35:50 2012 -0400
> 
> Apply patch from John Ruemker to resolve rhbz#803474
> 
> ---
>  rgmanager/src/daemons/main.c     |    8 +++++++-
>  rgmanager/src/daemons/rg_event.c |    4 ++--
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
> index 94047c3..9a1e5e9 100644
> --- a/rgmanager/src/daemons/main.c
> +++ b/rgmanager/src/daemons/main.c
> @@ -456,7 +456,13 @@ dispatch_msg(msgctx_t *ctx, int nodeid, int need_close)
>  			/* Centralized processing or request is from
>  			   clusvcadm */
>  			nid = event_master();
> -			if (nid != my_id()) {
> +			if (nid < 0) {
> +				logt_print(LOG_ERR, "#40b: Unable to determine "
> +					"event master\n");
> +				ret = -1;
> +				goto out;
> +			}
> +			else if (nid != my_id()) {
>  				/* Forward the message to the event master */
>  				forward_message(ctx, msg_sm, nid);
>  			} else {
> diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c
> index 7048bc6..e6a2abd 100644
> --- a/rgmanager/src/daemons/rg_event.c
> +++ b/rgmanager/src/daemons/rg_event.c
> @@ -247,7 +247,7 @@ static int
>  find_master(void)
>  {
>  	event_master_t *masterinfo = NULL;
> -	void *data;
> +	void *data = NULL;
>  	uint32_t sz;
>  	cluster_member_list_t *m;
>  	uint64_t vn;
> @@ -255,7 +255,7 @@ find_master(void)
>  
>  	m = member_list();
>  	if (vf_read(m, "Transition-Master", &vn,
> -		    (void **)(&data), &sz) < 0) {
> +		    (void **)(&data), &sz) != VFR_OK) {
>  		logt_print(LOG_ERR, "Unable to discover master"
>  		       " status\n");
>  		masterinfo = NULL;
> _______________________________________________
> cluster-commits mailing list
> cluster-commits at lists.fedorahosted.org
> https://fedorahosted.org/mailman/listinfo/cluster-commits