Rev 312: merge from ronnie in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 312
revision-id: tridge at samba.org-20070517024650-i4at8m57g4gzoasu
parent: tridge at samba.org-20070517024309-2e9qy28mgxdcevc2
parent: sahlberg at ronnie-20070517020729-prfu9kv7k2x1m8rp
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Thu 2007-05-17 12:46:50 +1000
message:
  merge from ronnie
modified:
  common/ctdb_client.c           ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  include/ctdb.h                 ctdb.h-20061117234101-o3qt14umlg9en8z0-11
  tools/ctdb_control.c           ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
    ------------------------------------------------------------
    revno: 197.1.116
    merged: sahlberg at ronnie-20070517020729-prfu9kv7k2x1m8rp
    parent: sahlberg at ronnie-20070517004531-ttyt43eorz178m4p
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Thu 2007-05-17 12:07:29 +1000
    message:
      we no longer pass lmaster across during pulldb    so dont print it from 
      catdb either
=== modified file 'common/ctdb_client.c'
--- a/common/ctdb_client.c	2007-05-17 00:45:31 +0000
+++ b/common/ctdb_client.c	2007-05-17 02:07:29 +0000
@@ -1109,7 +1109,6 @@
 	
 	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 @@
 	for (i=0;i<reply->count;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;
 

=== modified file 'include/ctdb.h'
--- a/include/ctdb.h	2007-05-17 00:45:31 +0000
+++ b/include/ctdb.h	2007-05-17 02:07:29 +0000
@@ -244,7 +244,6 @@
 	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);

=== modified file 'tools/ctdb_control.c'
--- a/tools/ctdb_control.c	2007-05-17 00:45:31 +0000
+++ b/tools/ctdb_control.c	2007-05-17 02:07:29 +0000
@@ -513,8 +513,8 @@
 			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++;
 		}