diff options
| author | Sage Weil <sage@newdream.net> | 2011-01-21 21:16:46 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-01-25 08:16:37 -0800 |
| commit | d66bbd441c08fe00ed2add1cf70cb243ebc2b27e (patch) | |
| tree | bde3d1bf8d6a665b14e2b86e82506c8c7b3b0657 /fs/ceph | |
| parent | 7e57b81c7688c762bc9e775bc83f9fc17946f527 (diff) | |
| download | blackbird-op-linux-d66bbd441c08fe00ed2add1cf70cb243ebc2b27e.tar.gz blackbird-op-linux-d66bbd441c08fe00ed2add1cf70cb243ebc2b27e.zip | |
ceph: avoid picking MDS that is not active
Ignore replication or auth frag data if it indicates an MDS that is not
active. This can happen if the MDS shuts down and the client has stale
data about the namespace distribution across the MDS cluster. If that's
the case, fall back to directing the request based on the auth cap (which
should always be accurate).
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/mds_client.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 509339ceef72..a6949cc7c69a 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -693,9 +693,11 @@ static int __choose_mds(struct ceph_mds_client *mdsc, dout("choose_mds %p %llx.%llx " "frag %u mds%d (%d/%d)\n", inode, ceph_vinop(inode), - frag.frag, frag.mds, + frag.frag, mds, (int)r, frag.ndist); - return mds; + if (ceph_mdsmap_get_state(mdsc->mdsmap, mds) >= + CEPH_MDS_STATE_ACTIVE) + return mds; } /* since this file/dir wasn't known to be @@ -708,7 +710,9 @@ static int __choose_mds(struct ceph_mds_client *mdsc, dout("choose_mds %p %llx.%llx " "frag %u mds%d (auth)\n", inode, ceph_vinop(inode), frag.frag, mds); - return mds; + if (ceph_mdsmap_get_state(mdsc->mdsmap, mds) >= + CEPH_MDS_STATE_ACTIVE) + return mds; } } } |
