From f4738f9c41d5871b13b9ff27b7c84332d5386a0e Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Thu, 17 May 2007 12:07:29 +1000 Subject: [PATCH] we no longer pass lmaster across during pulldb so dont print it from catdb either (This used to be ctdb commit b57d60f4789ea7f0dd69c93f6629d8742e182576) --- ctdb/common/ctdb_client.c | 3 +-- ctdb/include/ctdb.h | 1 - ctdb/tools/ctdb_control.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c index cde9584fb76..b49ee78df8a 100644 --- a/ctdb/common/ctdb_client.c +++ b/ctdb/common/ctdb_client.c @@ -1109,7 +1109,6 @@ int ctdb_ctrl_pulldb(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid keys->keys = talloc_array(mem_ctx, TDB_DATA, keys->num); keys->headers = talloc_array(mem_ctx, struct ctdb_ltdb_header, keys->num); - keys->lmasters = talloc_array(mem_ctx, uint32_t, keys->num); keys->data = talloc_array(mem_ctx, TDB_DATA, keys->num); rec = (struct ctdb_rec_data *)&reply->data[0]; @@ -1117,7 +1116,7 @@ int ctdb_ctrl_pulldb(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid for (i=0;icount;i++) { keys->keys[i].dptr = talloc_memdup(mem_ctx, &rec->data[0], rec->keylen); keys->keys[i].dsize = rec->keylen; - + keys->data[i].dptr = talloc_memdup(mem_ctx, &rec->data[keys->keys[i].dsize], rec->datalen); keys->data[i].dsize = rec->datalen; diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h index 59bfbdea115..782fda9f336 100644 --- a/ctdb/include/ctdb.h +++ b/ctdb/include/ctdb.h @@ -244,7 +244,6 @@ struct ctdb_key_list { uint32_t num; TDB_DATA *keys; struct ctdb_ltdb_header *headers; - uint32_t *lmasters; TDB_DATA *data; }; int ctdb_ctrl_pulldb(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid, uint32_t lmaster, TALLOC_CTX *mem_ctx, struct ctdb_key_list *keys); diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c index f8691fe5fdc..36b70c81988 100644 --- a/ctdb/tools/ctdb_control.c +++ b/ctdb/tools/ctdb_control.c @@ -513,8 +513,8 @@ static int control_catdb(struct ctdb_context *ctdb, int argc, const char **argv) keystr = hex_encode(ctdb, keys.keys[i].dptr, keys.keys[i].dsize); datastr = hex_encode(ctdb, keys.data[i].dptr, keys.data[i].dsize); - printf("rsn:%llu lmaster:%d dmaster:%d key:%s data:%s\n", - (unsigned long long)keys.headers[i].rsn, keys.lmasters[i], + printf("rsn:%llu dmaster:%d key:%s data:%s\n", + (unsigned long long)keys.headers[i].rsn, keys.headers[i].dmaster, keystr, datastr); ret++; } -- 2.47.3