[Cluster-devel] cluster/cmirror/src cluster.c local.c rbtree.c
jbrassow at sourceware.org
jbrassow at sourceware.org
Fri Nov 9 05:47:07 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: jbrassow at sourceware.org 2007-11-09 05:47:05
Modified files:
cmirror/src : cluster.c local.c rbtree.c
Log message:
- omission of stdint.h means failure to compile
- other additions to debugging output
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror/src/cluster.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.5&r2=1.1.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror/src/local.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.4&r2=1.1.2.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror/src/rbtree.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.1&r2=1.1.2.2
--- cluster/cmirror/src/Attic/cluster.c 2007/11/08 22:16:53 1.1.2.5
+++ cluster/cmirror/src/Attic/cluster.c 2007/11/09 05:47:05 1.1.2.6
@@ -617,11 +617,13 @@
LOG_ERROR("Badly sized message recieved from cluster.");
if (tfr->request_type & DM_CLOG_RESPONSE)
- LOG_DBG("Response from cluster recieved %s",
- RQ_TYPE(tfr->request_type & ~DM_CLOG_RESPONSE));
+ LOG_DBG("Response to %u from %u recieved [%s/%llu]",
+ tfr->originator, nodeid,
+ RQ_TYPE(tfr->request_type & ~DM_CLOG_RESPONSE),
+ tfr->seq);
else
- LOG_DBG("Request from cluster recieved %s",
- RQ_TYPE(tfr->request_type));
+ LOG_DBG("Request from %u recieved [%s/%llu]",
+ nodeid, RQ_TYPE(tfr->request_type), tfr->seq);
if (my_cluster_id == 0xDEAD) {
LOG_DBG("Message before init... ignoring.\n");
--- cluster/cmirror/src/Attic/local.c 2007/11/08 22:16:53 1.1.2.4
+++ cluster/cmirror/src/Attic/local.c 2007/11/09 05:47:05 1.1.2.5
@@ -151,8 +151,8 @@
if (r)
return r;
- LOG_DBG("Request from kernel recieved [%s]",
- RQ_TYPE(tfr->request_type));
+ LOG_DBG("Request from kernel recieved [%s/%llu]",
+ RQ_TYPE(tfr->request_type), tfr->seq);
switch (tfr->request_type) {
case DM_CLOG_CTR:
case DM_CLOG_DTR:
--- cluster/cmirror/src/Attic/rbtree.c 2007/11/08 22:16:53 1.1.2.1
+++ cluster/cmirror/src/Attic/rbtree.c 2007/11/09 05:47:05 1.1.2.2
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <errno.h>
#include <string.h>
#include "logging.h"
@@ -295,7 +296,7 @@
{
struct rb_node *x, *y;
- LOG_DBG("TREE: remove %llu", *((uint64_t *)KEY(new)));
+ LOG_DBG("TREE: remove %llu", *((uint64_t *)KEY(del)));
if ((LEFT(del) == NIL(t)) || (RIGHT(del) == NIL(t)))
y = del;
else
More information about the Cluster-devel
mailing list