From patchwork Wed May 11 10:44:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henry Chang X-Patchwork-Id: 776902 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4BGKZRa014043 for ; Wed, 11 May 2011 16:20:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756155Ab1EKQU1 (ORCPT ); Wed, 11 May 2011 12:20:27 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:36593 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756670Ab1EKQUY (ORCPT ); Wed, 11 May 2011 12:20:24 -0400 Received: by pzk9 with SMTP id 9so309077pzk.19 for ; Wed, 11 May 2011 09:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=A4yzTv5cjeaVpPJ1w8by7wxc1x9bub9vPv71NqXi4TM=; b=Len4wE4nwLB4mzohliWqH8NwTjj326QUUWGFRWgMcSaJCo6MV/G+4bxvnZjqFbyhNq uCChoHcdoqxylK+YgdYM19OaeHDe/46P09jVh+kNaXH7kwur5gTwm4H/FFCNANhiHp+P 6ZWWSayA6d8IkZjQmRtj1QCHbaylDu5SDqf14= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=ZI2o9X2tYU61p57nRRFmlcD2wjUKX1THDjrBKihg7HA+dXObBWG6HqT7siORanRl7q n3V/7gJvpKEV7T0CUZDoRJQa/lUGrIykCRcZ9rDoqShfV1LS1MD4FBqOA0gsUi3lHhbu V8BBFO7gNcY4FKiODluZra2nHzd4rNoAiQVwQ= Received: by 10.68.60.202 with SMTP id j10mr1863001pbr.302.1305110709267; Wed, 11 May 2011 03:45:09 -0700 (PDT) Received: from localhost.localdomain (59-124-35-221.HINET-IP.hinet.net [59.124.35.221]) by mx.google.com with ESMTPS id 9sm4270800pbt.46.2011.05.11.03.45.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 May 2011 03:45:08 -0700 (PDT) From: Henry C Chang To: ceph-devel@vger.kernel.org Cc: Henry C Chang Subject: [PATCH] mds: issue caps on file update finish if no client cap specified Date: Wed, 11 May 2011 03:44:56 -0700 Message-Id: <1305110696-2688-1-git-send-email-henry.cy.chang@gmail.com> X-Mailer: git-send-email 1.7.4.1 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 11 May 2011 16:20:36 +0000 (UTC) Fix the following scenario that happens occasionally when running blogbench: client released caps on one inode. Then, the inode's ifile was wrlocked during updating client range. Before the update had finished, client re-opened the file again for reading. Since ifile was wrlocked, the client was not given the Fr cap and was blocked on reading forever. Signed-off-by: Henry C Chang --- src/mds/Locker.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 3c7c190..36da98e 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -1242,7 +1242,7 @@ void Locker::file_update_finish(CInode *in, Mutation *mut, bool share, client_t if (gather) eval_cap_gather(in); } else { - if (cap && (cap->wanted() & ~cap->pending())) { + if (!cap || (cap && (cap->wanted() & ~cap->pending()))) { issue_caps(in, cap); }