diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-10-29 13:44:12 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-10-29 13:44:12 +1100 |
| commit | f5e90ec3b5b7dadc1824c74eebf0ea36599b6caa (patch) | |
| tree | 93df293aea2b798e3aa4e95969d3ab9bb94aa091 /ctdb | |
| parent | 9e235af3a22495df6249a5815826daeaa575e323 (diff) | |
| download | samba-f5e90ec3b5b7dadc1824c74eebf0ea36599b6caa.tar.gz samba-f5e90ec3b5b7dadc1824c74eebf0ea36599b6caa.tar.xz samba-f5e90ec3b5b7dadc1824c74eebf0ea36599b6caa.zip | |
Revert "From Wolfgang M."
This reverts commit 5b70fa8cfd5916d3c212823ad5cc1b251ae175ed.
(This used to be ctdb commit 363e7e939ad46b3f75c83c30d4163d63876c2456)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_call.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ctdb/server/ctdb_call.c b/ctdb/server/ctdb_call.c index 1dac919925..cd52867811 100644 --- a/ctdb/server/ctdb_call.c +++ b/ctdb/server/ctdb_call.c @@ -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) { |