Merge commit 'origin/master' into martins

[sahlberg/ctdb.git] / server / ctdb_traverse.c

diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
index d44c27401a7495aaaa2f1d00622732ba277a3b52..10895ed59e6d91ecdb58d840821caacea4731d1f 100644 (file)
--- a/server/ctdb_traverse.c
+++ b/server/ctdb_traverse.c
@@ -74,7 +74,6 @@ static void ctdb_traverse_local_handler(uint8_t *rawdata, size_t length, void *p
 static int traverse_local_destructor(struct ctdb_traverse_local_handle *h)
 {
        kill(h->child, SIGKILL);
-       waitpid(h->child, NULL, 0);
        return 0;
 }
 
@@ -91,11 +90,11 @@ static int ctdb_traverse_local_fn(struct tdb_context *tdb, TDB_DATA key, TDB_DAT
        /* filter out non-authoritative and zero-length records */
        hdr = (struct ctdb_ltdb_header *)data.dptr;
        if (data.dsize <= sizeof(struct ctdb_ltdb_header) ||
-           hdr->dmaster != h->ctdb_db->ctdb->vnn) {
+           hdr->dmaster != h->ctdb_db->ctdb->pnn) {
                return 0;
        }
 
-       d = ctdb_marshall_record(h, 0, key, data);
+       d = ctdb_marshall_record(h, 0, key, NULL, data);
        if (d == NULL) {
                /* error handling is tricky in this child code .... */
                return -1;
@@ -193,7 +192,7 @@ static int ctdb_traverse_all_destructor(struct ctdb_traverse_all_handle *state)
 struct ctdb_traverse_all {
        uint32_t db_id;
        uint32_t reqid;
-       uint32_t vnn;
+       uint32_t pnn;
 };
 
 /* called when a traverse times out */
@@ -241,7 +240,7 @@ static struct ctdb_traverse_all_handle *ctdb_daemon_traverse_all(struct ctdb_db_
 
        r.db_id = ctdb_db->db_id;
        r.reqid = state->reqid;
-       r.vnn   = ctdb->vnn;
+       r.pnn   = ctdb->pnn;
 
        data.dptr = (uint8_t *)&r;
        data.dsize = sizeof(r);
@@ -280,10 +279,10 @@ static void traverse_all_callback(void *p, TDB_DATA key, TDB_DATA data)
        struct ctdb_rec_data *d;
        TDB_DATA cdata;
 
-       d = ctdb_marshall_record(state, state->reqid, key, data);
+       d = ctdb_marshall_record(state, state->reqid, key, NULL, data);
        if (d == NULL) {
                /* darn .... */
-               DEBUG(0,("Out of memory in traverse_all_callback\n"));
+               DEBUG(DEBUG_ERR,("Out of memory in traverse_all_callback\n"));
                return;
        }
 
@@ -293,7 +292,7 @@ static void traverse_all_callback(void *p, TDB_DATA key, TDB_DATA data)
        ret = ctdb_daemon_send_control(state->ctdb, state->srcnode, 0, CTDB_CONTROL_TRAVERSE_DATA,
                                       0, CTDB_CTRL_FLAG_NOREPLY, cdata, NULL, NULL);
        if (ret != 0) {
-               DEBUG(0,("Failed to send traverse data\n"));
+               DEBUG(DEBUG_ERR,("Failed to send traverse data\n"));
        }
 
        if (key.dsize == 0 && data.dsize == 0) {
@@ -314,7 +313,7 @@ int32_t ctdb_control_traverse_all(struct ctdb_context *ctdb, TDB_DATA data, TDB_
        struct ctdb_db_context *ctdb_db;
 
        if (data.dsize != sizeof(struct ctdb_traverse_all)) {
-               DEBUG(0,("Invalid size in ctdb_control_traverse_all\n"));
+               DEBUG(DEBUG_ERR,("Invalid size in ctdb_control_traverse_all\n"));
                return -1;
        }
 
@@ -329,7 +328,7 @@ int32_t ctdb_control_traverse_all(struct ctdb_context *ctdb, TDB_DATA data, TDB_
        }
 
        state->reqid = c->reqid;
-       state->srcnode = c->vnn;
+       state->srcnode = c->pnn;
        state->ctdb = ctdb;
 
        state->h = ctdb_traverse_local(ctdb_db, traverse_all_callback, state);
@@ -355,7 +354,7 @@ int32_t ctdb_control_traverse_data(struct ctdb_context *ctdb, TDB_DATA data, TDB
        void *private_data;
 
        if (data.dsize < sizeof(uint32_t) || data.dsize != d->length) {
-               DEBUG(0,("Bad record size in ctdb_control_traverse_data\n"));
+               DEBUG(DEBUG_ERR,("Bad record size in ctdb_control_traverse_data\n"));
                return -1;
        }
 
@@ -408,7 +407,7 @@ static void traverse_start_callback(void *p, TDB_DATA key, TDB_DATA data)
 
        state = talloc_get_type(p, struct traverse_start_state);
 
-       d = ctdb_marshall_record(state, state->reqid, key, data);
+       d = ctdb_marshall_record(state, state->reqid, key, NULL, data);
        if (d == NULL) {
                return;
        }
@@ -434,7 +433,7 @@ int32_t ctdb_control_traverse_start(struct ctdb_context *ctdb, TDB_DATA data,
        struct ctdb_db_context *ctdb_db;
 
        if (data.dsize != sizeof(*d)) {
-               DEBUG(0,("Bad record size in ctdb_control_traverse_start\n"));
+               DEBUG(DEBUG_ERR,("Bad record size in ctdb_control_traverse_start\n"));
                return -1;
        }