client: don't embed cap releases in clientreplay

If the client is sending replay requests, avoid sending embedded caps, since the mds already has the client's caps from the reconnect. This matches the behavior of the kernel client. Fixes ceph#4742. Signed-off-by: Sam Lang <[email protected]> Reviewed-by: Sage Weil <[email protected]> Reviewed-by: Greg Farnum <[email protected]>
matutter · Apr 26, 2013 · 5121e56 · 5121e56
1 parent a5cade1
commit 5121e56
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -1574,15 +1574,16 @@ void Client::send_request(MetaRequest *request, MetaSession *session)
   ldout(cct, 10) << "send_request rebuilding request " << request->get_tid()
 		 << " for mds." << mds << dendl;
   MClientRequest *r = build_client_request(request);
-  if (request->dentry())
+  if (request->dentry()) {
     r->set_dentry_wanted();
-  if (request->got_unsafe)
+  }
+  if (request->got_unsafe) {
     r->set_replayed_op();
+    encode_cap_releases(request, mds);
+    r->releases.swap(request->cap_releases);
+  }
   r->set_mdsmap_epoch(mdsmap->get_epoch());
 
-  encode_cap_releases(request, mds);
-  r->releases.swap(request->cap_releases);
-
   if (request->mds == -1) {
     request->sent_stamp = ceph_clock_now(cct);
     ldout(cct, 20) << "send_request set sent_stamp to " << request->sent_stamp << dendl;