Cluster Project branch, RHEL5, updated. cmirror_1_1_15-75-g4bb2322

Cluster Project branch, RHEL5, updated. cmirror_1_1_15-75-g4bb2322

[jbrassow]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=4bb2322b04209f54dd5d3f35efb79cf8b97b7867

The branch, RHEL5 has been updated
       via  4bb2322b04209f54dd5d3f35efb79cf8b97b7867 (commit)
      from  0f92723caa7573894d2ce1b8c3271bce564b5726 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4bb2322b04209f54dd5d3f35efb79cf8b97b7867
Author: Jonathan Brassow <jbrassow@redhat.com>
Date:   Thu May 15 13:24:22 2008 -0500

    clogd:  No reason to alarm ppl with error messages during a retry
    
    Previous output:
    clogd[1485]: Bad transmission, requesting resend [275462]
    clogd[1485]: Bad callback on local/4
    
    I don't think these error messages are necessary when simply
    requesting a resend on an unreliable interface.

-----------------------------------------------------------------------

Summary of changes:
 cmirror/src/local.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmirror/src/local.c b/cmirror/src/local.c
index 4d66e17..d7f9f8c 100644
--- a/cmirror/src/local.c
+++ b/cmirror/src/local.c
@@ -57,9 +57,8 @@ static int kernel_ack(uint32_t seq, int error)
  * kernel_recv
  * @tfr: the newly allocated request from kernel
  *
- * Read requests from the kernel and allocate
- * space for the new request.  If there is no
- * request from the kernel, *tfr is NULL.
+ * Read requests from the kernel and allocate space for the new request.
+ * If there is no request from the kernel, *tfr is NULL.
  *
  * Returns: 0 on success, -EXXX on error
  */
@@ -126,13 +125,15 @@ static int kernel_recv(struct clog_tfr **tfr)
 		memcpy(*tfr, msg->data, msg->len);
 
 		if (!(*tfr)->request_type) {
-			LOG_ERROR("Bad transmission, requesting resend [%u]", msg->seq);
+			LOG_DBG("Bad transmission, requesting resend [%u]", msg->seq);
 			if (kernel_ack(msg->seq, EAGAIN)) {
 				LOG_ERROR("Failed to NACK kernel transmission [%u]",
 					  msg->seq);
 				r = -EBADE;
-			} else
-				r = -EAGAIN;
+			} else {
+				r = 0;
+				*tfr = NULL;
+			}
 		}
 		break;
 	default:
@@ -200,7 +201,7 @@ static int do_local_work(void *data)
 		return r;
 
 	if (!tfr)
-		return -EBADE;
+		return 0;
 
 	LOG_DBG("[%s]  Request from kernel received: [%s/%u]",
 		SHORT_UUID(tfr->uuid), RQ_TYPE(tfr->request_type),


hooks/post-receive
--
Cluster Project