[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - 3.2.11-ctdb-64-3-gf96db2a
Michael Adam
obnox at samba.org
Tue Sep 15 08:52:56 MDT 2009
The branch, v3-2-ctdb has been updated
via f96db2a7501c994ff370ad182a095fc784e1826b (commit)
from f9a8a677279e3c9f8783604b4c551c7463c64b94 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -----------------------------------------------------------------
commit f96db2a7501c994ff370ad182a095fc784e1826b
Author: Michael Adam <obnox at samba.org>
Date: Fri Sep 11 13:23:34 2009 +0200
s3:dbwrap_ctdb: set dmaster in ctdb_transaction_store() also when updating an existing record
not only when creating a record.
This matches commit e9194a130327d6b05a8ab90bd976475b0e93b06d from ctdb-master.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source/lib/dbwrap_ctdb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/dbwrap_ctdb.c b/source/lib/dbwrap_ctdb.c
index 60dc857..259532b 100644
--- a/source/lib/dbwrap_ctdb.c
+++ b/source/lib/dbwrap_ctdb.c
@@ -469,7 +469,6 @@ static int db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h,
This is only safe because we are in a transaction and this
is a persistent database */
ZERO_STRUCT(header);
- header.dmaster = get_my_vnn();
} else {
memcpy(&header, rec.dptr, sizeof(struct ctdb_ltdb_header));
rec.dsize -= sizeof(struct ctdb_ltdb_header);
@@ -483,6 +482,7 @@ static int db_ctdb_transaction_store(struct db_ctdb_transaction_handle *h,
SAFE_FREE(rec.dptr);
}
+ header.dmaster = get_my_vnn();
header.rsn++;
if (!h->in_replay) {
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list