Merge trunk revision 2415:

r2415 | sdake | 2009-09-14 11:58:08 -0700 (Mon, 14 Sep 2009) | 3 lines

Fix dispatch returning TRY_AGAIN when using DISPATCH_ALL parameter because of
regression caused by revision 2046:lib/coroipcc.c.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2457 fd59a12c-fef9-0310-b244-a6a79926bd2f

lib/cfg.c

@@ -181,8 +181,7 @@ corosync_cfg_dispatch (
 		if (error != CS_OK) {
 			goto error_put;
 		}
-
-		if (dispatch_data == NULL) {
+		if (error == CS_ERR_TRY_AGAIN) {
 			if (dispatch_flags == CPG_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {

lib/confdb.c

@@ -316,7 +316,7 @@ cs_error_t confdb_dispatch (
 		if (error != CS_OK) {
 			goto error_put;
 		}
-		if (dispatch_data == NULL) {
+		if (error == CS_ERR_TRY_AGAIN) {
 			if (dispatch_types == CONFDB_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {

lib/cpg.c

@@ -250,8 +250,7 @@ cs_error_t cpg_dispatch (
 		if (error != CS_OK) {
 			goto error_put;
 		}
-
-		if (dispatch_data == NULL) {
+		if (error == CS_ERR_TRY_AGAIN) {
 			if (dispatch_types == CPG_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {

lib/evs.c

@@ -258,8 +258,7 @@ evs_error_t evs_dispatch (
 		if (error != CS_OK) {
 			goto error_put;
 		}
-
-		if (dispatch_data == NULL) {
+		if (error == CS_ERR_TRY_AGAIN) {
 			if (dispatch_types == CPG_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {

lib/quorum.c

@@ -365,6 +365,13 @@ cs_error_t quorum_dispatch (
 		if (error != CS_OK) {
 			goto error_put;
 		}
+		if (error == CS_ERR_TRY_AGAIN) {
+			if (dispatch_types == CPG_DISPATCH_ALL) {
+				break; /* exit do while cont is 1 loop */
+			} else {
+				continue; /* next poll */
+			}
+		}
 
 		/*
 		 * Make copy of callbacks, message data, unlock instance, and call callback

lib/votequorum.c

@@ -719,8 +719,7 @@ cs_error_t votequorum_dispatch (
 		if (error != CS_OK) {
 			goto error_put;
 		}
-
-		if (dispatch_data == NULL) {
+		if (error == CS_ERR_TRY_AGAIN) {
 			if (dispatch_types == CPG_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {