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

Delay reusing ids to make protocol more robust

Browse Source 
Ronnie and I tracked down a bug which seems to be caused by a node
running so slowly that we timed out the request and reused the request
id before it responded.

The result was that we unlocked the wrong record, leading to the
following:

	ctdbd: tdb_unlock: count is 0
	ctdbd: tdb_chainunlock failed
	smbd[1630912]: [2010/06/08 15:32:28.251716,  0] lib/util_sock.c:1491(get_peer_addr_internal)
	ctdbd: Could not find idr:43
	ctdbd: server/ctdb_call.c:492 reqid 43 not found

This exact problem is now detected, but in general we want to delay
id reuse as long as possible to make our system more robust.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>


(This used to be ctdb commit 9eb9c53ef29f4871ae2fe62fc5cb6145fca89eed)
This commit is contained in:
Rusty Russell 2010-06-10 08:58:55 +09:30
parent b31b0d79c3
commit 5f9e4b60ae
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/client/ctdb_client.c
View File

@ -2916,6 +2916,8 @@ struct ctdb_context *ctdb_init(struct event_context *ev)
}
ctdb->ev = ev;
ctdb->idr = idr_init(ctdb);
/* Wrap early to exercise code. */
ctdb->lastid = INT_MAX-2;
CTDB_NO_MEMORY_NULL(ctdb, ctdb->idr);
ret = ctdb_set_socketname(ctdb, CTDB_PATH);

8
ctdb/common/ctdb_util.c
View File

@ -159,7 +159,13 @@ void ctdb_reclock_latency(struct ctdb_context *ctdb, const char *name, double *l
uint32_t ctdb_reqid_new(struct ctdb_context *ctdb, void *state)
{
return idr_get_new(ctdb->idr, state, INT_MAX);
int id = idr_get_new_above(ctdb->idr, state, ctdb->lastid+1, INT_MAX);
if (id < 0) {
DEBUG(DEBUG_NOTICE, ("Reqid wrap!\n"));
id = idr_get_new(ctdb->idr, state, INT_MAX);
}
ctdb->lastid = id;
return id;
}
void *_ctdb_reqid_find(struct ctdb_context *ctdb, uint32_t reqid, const char *type, const char *location)

2
ctdb/include/ctdb_private.h
View File

@ -412,7 +412,7 @@ struct ctdb_context {
unsigned flags;
uint32_t capabilities;
struct idr_context *idr;
uint16_t idr_cnt;
int lastid;
struct ctdb_node **nodes; /* array of nodes in the cluster - indexed by vnn */
struct ctdb_vnn *vnn; /* list of public ip addresses and interfaces */
struct ctdb_vnn *single_ip_vnn; /* a structure for the single ip */