From 3fcf905dd65d6db514d403e2829b039df7bd9645 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Fri, 30 Oct 2015 17:28:02 +0800 Subject: [PATCH] client: cancel revoking caps when reconnecting the mds Signed-off-by: Yan, Zheng (cherry picked from commit 9ab61b2779740d9038b169da0de616b89b07b813) --- src/client/Client.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 546066a1a619d..b1de66a225623 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -2487,14 +2487,16 @@ void Client::send_reconnect(MetaSession *session) bufferlist flockbl; _encode_filelocks(in, flockbl); - in->caps[mds]->seq = 0; // reset seq. - in->caps[mds]->issue_seq = 0; // reset seq. - in->caps[mds]->mseq = 0; // reset seq. + Cap *cap = in->caps[mds]; + cap->seq = 0; // reset seq. + cap->issue_seq = 0; // reset seq. + cap->mseq = 0; // reset seq. + cap->issued = cap->implemented; m->add_cap(p->first.ino, - in->caps[mds]->cap_id, + cap->cap_id, path.get_ino(), path.get_path(), // ino in->caps_wanted(), // wanted - in->caps[mds]->issued, // issued + cap->issued, // issued in->snaprealm->ino, flockbl); -- 2.39.5