[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-72-g607cd96



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=607cd9680d773fff362144249328c3b6d75a4443

The branch, RHEL5 has been updated
       via  607cd9680d773fff362144249328c3b6d75a4443 (commit)
      from  685498d154acfff23e4af7bfe874a7b0ed2eb9c5 (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 607cd9680d773fff362144249328c3b6d75a4443
Author: Jonathan Brassow <jbrassow redhat com>
Date:   Wed May 14 14:24:24 2008 -0500

    clogd + dm-log-clustered:  Change 64bit seq number to 32 bits
    
    Having a 32-bit seq number matches better with the connector
    seq number length.  I don't have to worry about rollover anyway.

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

Summary of changes:
 cmirror-kernel/src/dm-clog-tfr.c |   12 ++++++------
 cmirror-kernel/src/dm-clog-tfr.h |    2 +-
 cmirror/src/cluster.c            |   32 ++++++++++++++++----------------
 cmirror/src/functions.c          |    8 ++++----
 cmirror/src/local.c              |    4 ++--
 cmirror/src/queues.c             |   12 ++++++------
 6 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/cmirror-kernel/src/dm-clog-tfr.c b/cmirror-kernel/src/dm-clog-tfr.c
index 6126691..61f6f21 100644
--- a/cmirror-kernel/src/dm-clog-tfr.c
+++ b/cmirror-kernel/src/dm-clog-tfr.c
@@ -16,7 +16,7 @@
 
 #define SHORT_UUID(x) (strlen(x) > 8) ? ((x) + (strlen(x) - 8)) : (x)
 
-static uint64_t seq = 0;
+static uint32_t seq = 0;
 
 /*
  * Pre-allocated space for speed
@@ -33,7 +33,7 @@ struct receiving_pkg {
 	struct completion complete;
 
 	unsigned long long start_time;
-	uint64_t seq;
+	uint32_t seq;
 
 	int error;
 	int *data_size;
@@ -90,7 +90,7 @@ static void cn_clog_callback(void *data)
 	list_for_each_entry(pkg, &receiving_list, list) {
 		/*
 		DMINFO("Msg from userspace received [%s].", RQ_TYPE(tfr->request_type));
-		DMINFO("  Seq # received: %llu    Seq # wanted: %llu",
+		DMINFO("  Seq # received: %u    Seq # wanted: %u",
 		       pkg->seq, tfr->seq);
 		*/
 		if (tfr->seq == pkg->seq) {
@@ -112,7 +112,7 @@ static void cn_clog_callback(void *data)
 
 	spin_unlock(&receiving_list_lock);
 	if (!found)
-		DMERR("Stray request returned: %s, %llu",
+		DMERR("Stray request returned: %s, %u",
 		      RQ_TYPE(tfr->request_type), tfr->seq);
 }
 
@@ -188,7 +188,7 @@ resend:
 
 	r = wait_for_completion_timeout(&(pkg.complete), 15 * HZ);
 	if (!r) {
-		DMWARN("[%s] Request timed out: [%s/%llu] - retrying",
+		DMWARN("[%s] Request timed out: [%s/%u] - retrying",
 		       SHORT_UUID(uuid), RQ_TYPE(request_type), pkg.seq);
 		spin_lock(&receiving_list_lock);
 		list_del_init(&(pkg.list));
@@ -200,7 +200,7 @@ resend:
 		pkg.start_time = (jiffies - pkg.start_time);
 		do_div(pkg.start_time, HZ);
 		if (pkg.start_time > 0)
-			DMWARN("Excessive delay in request processing, %llu sec: [%s/%llu]",
+			DMWARN("Excessive delay in request processing, %llu sec: [%s/%u]",
 			       pkg.start_time, RQ_TYPE(request_type),
 			       pkg.seq);
 	}
diff --git a/cmirror-kernel/src/dm-clog-tfr.h b/cmirror-kernel/src/dm-clog-tfr.h
index e12d39a..bdf4b6d 100644
--- a/cmirror-kernel/src/dm-clog-tfr.h
+++ b/cmirror-kernel/src/dm-clog-tfr.h
@@ -56,7 +56,7 @@ struct clog_tfr {
 	int error;              /* Used by server to inform of errors */
 	uint32_t originator;    /* Cluster ID of this machine */
 
-	uint64_t seq;           /* Sequence number for request */
+	uint32_t seq;           /* Sequence number for request */
 	uint32_t request_type;  /* DM_CLOG_* */
 	uint32_t data_size;     /* How much data (not including this struct) */
 	char data[0];
diff --git a/cmirror/src/cluster.c b/cmirror/src/cluster.c
index 19b3ef0..dcb2806 100644
--- a/cmirror/src/cluster.c
+++ b/cmirror/src/cluster.c
@@ -156,10 +156,10 @@ static int handle_cluster_request(struct clog_tfr *tfr, int server, int printz)
 		 * Errors from previous functions are in the tfr struct.
 		 */
 		if (printz)
-			LOG_DBG("[%s] Sending response to %u on cluster: [%s/%llu]",
+			LOG_DBG("[%s] Sending response to %u on cluster: [%s/%u]",
 				SHORT_UUID(tfr->uuid), tfr->originator,
 				RQ_TYPE(tfr->request_type & ~DM_CLOG_RESPONSE),
-				(unsigned long long)tfr->seq);
+				tfr->seq);
 		r = cluster_send(tfr);
 		if (r)
 			LOG_ERROR("cluster_send failed: %s", strerror(-r));
@@ -188,9 +188,9 @@ static int handle_cluster_response(struct clog_tfr *tfr)
 
 		/* Unable to find match for response */
 
-		LOG_ERROR("[%s] No match for cluster response: %s:%llu",
+		LOG_ERROR("[%s] No match for cluster response: %s:%u",
 			  SHORT_UUID(tfr->uuid), RQ_TYPE(tfr->request_type),
-			  (unsigned long long)tfr->seq);
+			  tfr->seq);
 
 		INIT_LIST_HEAD(&l);
 		queue_remove_all(&l, cluster_queue);
@@ -200,9 +200,9 @@ static int handle_cluster_response(struct clog_tfr *tfr)
 		list_for_each_safe(p, n, &l) {
 			list_del_init(p);
 			t = (struct clog_tfr *)p;
-			LOG_ERROR("   [%s]  %s:%llu", SHORT_UUID(t->uuid),
+			LOG_ERROR("   [%s]  %s:%u", SHORT_UUID(t->uuid),
 				  RQ_TYPE(t->request_type),
-				  (unsigned long long)t->seq);
+				  t->seq);
 			queue_add(t, cluster_queue);
 		}
 
@@ -712,19 +712,19 @@ static void cpg_message_callback(cpg_handle_t handle, struct cpg_name *gname,
 		LOG_ERROR("Badly sized message received from cluster.");
 
 	if (tfr->request_type & DM_CLOG_RESPONSE)
-		LOG_DBG("Response to %u from %u received [%s/%llu]",
+		LOG_DBG("Response to %u from %u received [%s/%u]",
 			tfr->originator, nodeid,
 			RQ_TYPE(tfr->request_type & ~DM_CLOG_RESPONSE),
-			(unsigned long long)tfr->seq);
+			tfr->seq);
 	else
-		LOG_DBG("Request from %u received [%s/%llu]",
+		LOG_DBG("Request from %u received [%s/%u]",
 			nodeid, RQ_TYPE(tfr->request_type),
-			(unsigned long long)tfr->seq);
+			tfr->seq);
 
 	if (my_cluster_id == 0xDEAD) {
-		LOG_ERROR("[%s]  Message from %u before init [%s/%llu]",
+		LOG_ERROR("[%s]  Message from %u before init [%s/%u]",
 			  SHORT_UUID(tfr->uuid), nodeid,
-			  RQ_TYPE(tfr->request_type), (unsigned long long) tfr->seq);
+			  RQ_TYPE(tfr->request_type), tfr->seq);
 		return;
 	}
 
@@ -735,9 +735,9 @@ static void cpg_message_callback(cpg_handle_t handle, struct cpg_name *gname,
 	}
 
 	if (match->lowest_id == 0xDEAD) {
-		LOG_ERROR("[%s]  Message from %u before init* [%s/%llu]",
+		LOG_ERROR("[%s]  Message from %u before init* [%s/%u]",
 			  SHORT_UUID(tfr->uuid), nodeid,
-			  RQ_TYPE(tfr->request_type), (unsigned long long)tfr->seq);
+			  RQ_TYPE(tfr->request_type), tfr->seq);
 		return;
 	}
 
@@ -888,8 +888,8 @@ out:
 		idx++;
 		idx = idx % DEBUGGING_HISTORY;
 		len = sprintf(debugging[idx],
-			      "SEQ#=%llu, UUID=%s, TYPE=%s, ORIG=%u, RESP=%s",
-			      (unsigned long long)tfr->seq,
+			      "SEQ#=%u, UUID=%s, TYPE=%s, ORIG=%u, RESP=%s",
+			      tfr->seq,
 			      SHORT_UUID(tfr->uuid),
 			      RQ_TYPE(tfr->request_type),
 			      tfr->originator, (response) ? "YES" : "NO");
diff --git a/cmirror/src/functions.c b/cmirror/src/functions.c
index f34ed77..9bafd07 100644
--- a/cmirror/src/functions.c
+++ b/cmirror/src/functions.c
@@ -1180,18 +1180,18 @@ static int clog_set_region_sync(struct clog_tfr *tfr)
 
 	if (pkg->in_sync) {
 		if (log_test_bit(lc->sync_bits, pkg->region)) {
-			LOG_ERROR("[%s]  Region already in-sync: region=%llu, seq=%llu, who=%u",
+			LOG_ERROR("[%s]  Region already in-sync: region=%llu, seq=%u, who=%u",
 				  SHORT_UUID(lc->uuid),
 				  (unsigned long long)pkg->region,
-				  (unsigned long long)tfr->seq,
+				  tfr->seq,
 				  tfr->originator);
 		} else {
 			log_set_bit(lc, lc->sync_bits, pkg->region);
 			lc->sync_count++;
-			LOG_DBG("[%s] sync_count=%llu, Region %llu marked in-sync by %u, seq=%llu",
+			LOG_DBG("[%s] sync_count=%llu, Region %llu marked in-sync by %u, seq=%u",
 				SHORT_UUID(lc->uuid), (unsigned long long)lc->sync_count,
 				(unsigned long long)pkg->region, tfr->originator,
-				(unsigned long long)tfr->seq);
+				tfr->seq);
 		}
 	} else if (log_test_bit(lc->sync_bits, pkg->region)) {
 		lc->sync_count--;
diff --git a/cmirror/src/local.c b/cmirror/src/local.c
index da69b9f..0a9c581 100644
--- a/cmirror/src/local.c
+++ b/cmirror/src/local.c
@@ -160,9 +160,9 @@ static int do_local_work(void *data)
 	if (!tfr)
 		return -EBADE;
 
-	LOG_DBG("[%s]  Request from kernel received: [%s/%llu]",
+	LOG_DBG("[%s]  Request from kernel received: [%s/%u]",
 		SHORT_UUID(tfr->uuid), RQ_TYPE(tfr->request_type),
-		(unsigned long long)tfr->seq);
+		tfr->seq);
 	switch (tfr->request_type) {
 	case 0:
 		LOG_ERROR("Invalid request_type");
diff --git a/cmirror/src/queues.c b/cmirror/src/queues.c
index eeab79f..8d8e308 100644
--- a/cmirror/src/queues.c
+++ b/cmirror/src/queues.c
@@ -188,9 +188,9 @@ struct clog_tfr *queue_remove(struct queue *q)
 	q->count--;
 /*
 	if (q == cluster_queue)
-		LOG_ERROR("[%s] remove %s %llu",
+		LOG_ERROR("[%s] remove %s %u",
 			  SHORT_UUID(tfr->uuid), RQ_TYPE(tfr->request_type),
-			  (unsigned long long)tfr->seq);
+			  tfr->seq);
 */
 	return tfr;
 }
@@ -228,9 +228,9 @@ struct clog_tfr *queue_remove_match(struct queue *q,
 
 /*
 			if (q == cluster_queue)
-				LOG_ERROR("[%s] remove match %s %llu",
+				LOG_ERROR("[%s] remove match %s %u",
 					  SHORT_UUID(tfr->uuid), RQ_TYPE(tfr->request_type),
-					  (unsigned long long)tfr->seq);
+					  tfr->seq);
 */
 			return tfr;
 		}
@@ -257,9 +257,9 @@ void queue_remove_all(struct list_head *l, struct queue *q)
 		LOG_ERROR("[--] remove all");
 		list_for_each_safe(p, n, &q->list) {
 			tfr = (struct clog_tfr *)p;
-			LOG_ERROR("    [%s] %s %llu",
+			LOG_ERROR("    [%s] %s %u",
 				  SHORT_UUID(tfr->uuid), RQ_TYPE(tfr->request_type),
-				  (unsigned long long)tfr->seq);
+				  tfr->seq);
 		}
 	}		
 */


hooks/post-receive
--
Cluster Project


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]