]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix traverse snap vs forward check
authorSage Weil <sage.weil@dreamhost.com>
Wed, 21 Sep 2011 18:39:03 +0000 (11:39 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 21 Sep 2011 23:27:06 +0000 (16:27 -0700)
This should compare against the forward attempt, not retry attempt.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/mds/MDCache.cc

index a7a93c692dc3838d3ef82267739fabbf209bc80b..2844882153cb52e299a62eea03fb943767eb5ccb 100644 (file)
@@ -6791,9 +6791,9 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req, Context *fin,     // wh
 
       if (forward &&
          snapid && mdr && mdr->client_request &&
-         (int)depth < mdr->client_request->get_retry_attempt()) {
+         (int)depth < mdr->client_request->get_num_fwd()) {
        dout(7) << "traverse: snap " << snapid << " and depth " << depth
-               << " < retry " << mdr->client_request->get_retry_attempt()
+               << " < fwd " << mdr->client_request->get_num_fwd()
                << ", discovering instead of forwarding" << dendl;
        discover = true;
       }