sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

- merge from ronnie

Browse Source 
- increment rsn only in become_dmaster
- add torture check for rsn regression in ctdb_ltdb_store

(This used to be ctdb commit 8047506a08bb53ee01aa64f25c9f72839e1e2d68)
This commit is contained in:
Andrew Tridgell 2007-05-11 10:33:43 +10:00
commit 63acf8ab95
3 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/common/ctdb_call.c
View File

@ -295,7 +295,7 @@ static void ctdb_become_dmaster(struct ctdb_db_context *ctdb_db,
DEBUG(2,("vnn %u dmaster response %08x\n", ctdb->vnn, ctdb_hash(&key)));
ZERO_STRUCT(header);
header.rsn = rsn;
header.rsn = rsn + 1;
header.dmaster = ctdb->vnn;
if (ctdb_ltdb_store(ctdb_db, key, &header, data) != 0) {

68
ctdb/common/ctdb_client.c
View File

@ -1037,17 +1037,16 @@ int ctdb_ctrl_pulldb(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid
{
int i, ret;
TDB_DATA indata, outdata;
struct ctdb_control_pulldb pull;
struct ctdb_control_pulldb_reply *reply;
struct ctdb_rec_data *rec;
int32_t res;
unsigned char *ptr;
DEBUG(0,("ronnie to fix!\n"));
return -1;
pull.db_id = dbid;
pull.lmaster = lmaster;
indata.dsize = 2*sizeof(uint32_t);
indata.dptr = (unsigned char *)talloc_array(mem_ctx, uint32_t, 2);
((uint32_t *)(&indata.dptr[0]))[0] = dbid;
((uint32_t *)(&indata.dptr[0]))[1] = lmaster;
indata.dsize = sizeof(struct ctdb_control_pulldb);
indata.dptr = (unsigned char *)&pull;
ret = ctdb_control(ctdb, destnode, 0,
CTDB_CONTROL_PULL_DB, 0, indata,
@ -1058,44 +1057,33 @@ int ctdb_ctrl_pulldb(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid
}
keys->dbid = ((uint32_t *)(&outdata.dptr[0]))[0];
keys->num = ((uint32_t *)(&outdata.dptr[0]))[1];
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);
reply = (struct ctdb_control_pulldb_reply *)outdata.dptr;
keys->dbid = reply->db_id;
keys->num = reply->count;
/* loop over all key/data pairs */
ptr=&outdata.dptr[8];
for(i=0;i<keys->num;i++){
TDB_DATA *key, *data;
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);
keys->lmasters[i] = *((uint32_t *)ptr);
ptr += 4;
rec = (struct ctdb_rec_data *)&reply->data[0];
key = &keys->keys[i];
key->dsize = *((uint32_t *)ptr);
key->dptr = talloc_size(mem_ctx, key->dsize);
ptr += 4;
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;
data = &keys->data[i];
data->dsize = *((uint32_t *)ptr);
data->dptr = talloc_size(mem_ctx, data->dsize);
ptr += 4;
keys->data[i].dptr = talloc_memdup(mem_ctx, &rec->data[keys->keys[i].dsize], rec->datalen);
keys->data[i].dsize = rec->datalen;
ptr = outdata.dptr+(((ptr-outdata.dptr)+CTDB_DS_ALIGNMENT-1)& ~(CTDB_DS_ALIGNMENT-1));
memcpy(key->dptr, ptr, key->dsize);
ptr += key->dsize;
if (keys->data[i].dsize < sizeof(struct ctdb_ltdb_header)) {
DEBUG(0,(__location__ " bad ltdb record\n"));
return -1;
}
memcpy(&keys->headers[i], keys->data[i].dptr, sizeof(struct ctdb_ltdb_header));
keys->data[i].dptr += sizeof(struct ctdb_ltdb_header);
keys->data[i].dsize -= sizeof(struct ctdb_ltdb_header);
ptr = outdata.dptr+(((ptr-outdata.dptr)+CTDB_DS_ALIGNMENT-1)& ~(CTDB_DS_ALIGNMENT-1));
memcpy(&keys->headers[i], ptr, sizeof(struct ctdb_ltdb_header));
ptr += sizeof(struct ctdb_ltdb_header);
ptr = outdata.dptr+(((ptr-outdata.dptr)+CTDB_DS_ALIGNMENT-1)& ~(CTDB_DS_ALIGNMENT-1));
memcpy(data->dptr, ptr, data->dsize);
ptr += data->dsize;
ptr = outdata.dptr+(((ptr-outdata.dptr)+CTDB_DS_ALIGNMENT-1)& ~(CTDB_DS_ALIGNMENT-1));
rec = (struct ctdb_rec_data *)(rec->length + (uint8_t *)rec);
}
return 0;

11
ctdb/common/ctdb_ltdb.c
View File

@ -145,6 +145,17 @@ int ctdb_ltdb_store(struct ctdb_db_context *ctdb_db, TDB_DATA key,
TDB_DATA rec;
int ret;
if (ctdb->flags & CTDB_FLAG_TORTURE) {
struct ctdb_ltdb_header *h2;
rec = tdb_fetch(ctdb_db->ltdb->tdb, key);
h2 = (struct ctdb_ltdb_header *)rec.dptr;
if (rec.dptr && rec.dsize >= sizeof(h2) && h2->rsn > header->rsn) {
DEBUG(0,("RSN regression! %llu %llu\n",
(unsigned long long)h2->rsn, (unsigned long long)header->rsn));
}
if (rec.dptr) free(rec.dptr);
}
rec.dsize = sizeof(*header) + data.dsize;
rec.dptr = talloc_size(ctdb, rec.dsize);
CTDB_NO_MEMORY(ctdb, rec.dptr);