From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Thu, 10 May 2007 20:08:17 +0000 (+1000)
Subject: we must bump the rsn everytime we do a REQ_DMASTER or a REPLY_DMASTER
X-Git-Tag: tevent-0.9.20~348^2~2755^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9eeb4f1a51326d2044fdf302804149d45976ace6;p=thirdparty%2Fsamba.git

we must bump the rsn everytime we do a REQ_DMASTER or a REPLY_DMASTER
to make sure that the "merge records based on rsn during recovery" will
merge correctly.

this is extra important since samba3 never bumps the record when it
writes new data to it !

(This used to be ctdb commit 857e67204065603592c2dbbadbd8667ebba9ccdb)
---

diff --git a/ctdb/common/ctdb_call.c b/ctdb/common/ctdb_call.c
index 8dd03449a8f..76bc570c536 100644
--- a/ctdb/common/ctdb_call.c
+++ b/ctdb/common/ctdb_call.c
@@ -221,7 +221,7 @@ static void ctdb_send_dmaster_reply(struct ctdb_db_context *ctdb_db,
 
 	r->hdr.destnode  = new_dmaster;
 	r->hdr.reqid     = reqid;
-	r->rsn           = header->rsn;
+	r->rsn           = header->rsn + 1;
 	r->keylen        = key.dsize;
 	r->datalen       = data.dsize;
 	r->db_id         = ctdb_db->db_id;
@@ -263,7 +263,7 @@ static void ctdb_call_send_dmaster(struct ctdb_db_context *ctdb_db,
 	r->hdr.destnode  = lmaster;
 	r->hdr.reqid     = c->hdr.reqid;
 	r->db_id         = c->db_id;
-	r->rsn           = header->rsn;
+	r->rsn           = header->rsn + 1;
 	r->dmaster       = c->hdr.srcnode;
 	r->keylen        = key->dsize;
 	r->datalen       = data->dsize;