diff options
| author |   Sage Weil <sage@inktank.com> | 2012-07-20 17:24:40 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-07-30 18:16:00 -0700 |
| commit | 8dacc7da69a491c515851e68de6036f21b5663ce (patch) | |
| tree | 72e96abb5bc27d2a185cdea2f08a090302f0ede3 /include/linux/ceph | |
| parent | libceph: drop unnecessary CLOSED check in socket state change callback (diff) | |
| download | linux-dev-8dacc7da69a491c515851e68de6036f21b5663ce.tar.xz linux-dev-8dacc7da69a491c515851e68de6036f21b5663ce.zip | |
libceph: replace connection state bits with states
Use a simple set of 6 enumerated values for the socket states (CON_STATE_*)
and use those instead of the state bits. All of the con->state checks are
now under the protection of the con mutex, so this is safe. It also
simplifies many of the state checks because we can check for anything other
than the expected state instead of various bits for races we can think of.
This appears to hold up well to stress testing both with and without socket
failure injection on the server side.
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/messenger.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index a310d7fe6e29..d9c2b8f5abde 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h @@ -117,18 +117,6 @@ struct ceph_msg_pos { #define BACKOFF 15 /* - * ceph_connection states - */ -#define CONNECTING 1 -#define NEGOTIATING 2 -#define CONNECTED 5 -#define STANDBY 8 /* no outgoing messages, socket closed. we keep - * the ceph_connection around to maintain shared - * state with the peer. */ -#define CLOSED 10 /* we've closed the connection */ -#define OPENING 13 /* open connection w/ (possibly new) peer */ - -/* * A single connection with another host. * * We maintain a queue of outgoing messages, and some session state to |