sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

Revert "From Wolfgang M."

Browse Source 
This reverts commit 5b70fa8cfd5916d3c212823ad5cc1b251ae175ed.

(This used to be ctdb commit 363e7e939ad46b3f75c83c30d4163d63876c2456)
This commit is contained in:
Ronnie Sahlberg 2009-10-29 13:44:12 +11:00
parent 9e235af3a2
commit f5e90ec3b5
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ctdb/server/ctdb_call.c
View File

@ -342,13 +342,10 @@ void ctdb_request_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
ctdb_db->db_id, hdr->generation, ctdb->vnn_map->generation,
(unsigned long long)c->rsn, (unsigned long long)header.rsn, c->hdr.reqid,
(key.dsize >= 4)?(*(uint32_t *)key.dptr):0));
/*
* with the new vacuuming code there are conditions where a node has outdated
* information about the real dmaster
* since here we are lmaster and always know who is the real dmaster
* we don't need to exit with a fatal error and we even don't have
* to initiate a recovery
*/
if (header.rsn != 0 || header.dmaster != ctdb->pnn) {
ctdb_fatal(ctdb, "ctdb_req_dmaster from non-master");
return;
}
}
if (header.rsn > c->rsn) {