From patchwork Tue May 13 09:12:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Min Chen X-Patchwork-Id: 4163861 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 143B09F271 for ; Tue, 13 May 2014 09:20:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39EF920155 for ; Tue, 13 May 2014 09:20:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26F642034E for ; Tue, 13 May 2014 09:20:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759326AbaEMJUd (ORCPT ); Tue, 13 May 2014 05:20:33 -0400 Received: from m199-177.yeah.net ([123.58.177.199]:60252 "EHLO m199-177.yeah.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758984AbaEMJUb (ORCPT ); Tue, 13 May 2014 05:20:31 -0400 Received: from localhost.localdomain (unknown [202.197.9.8]) by m199-177.yeah.net (HMail) with ESMTPA id EFA0511017B9; Tue, 13 May 2014 17:12:23 +0800 (CST) From: Min Chen To: josh.durgin@inktank.com Cc: ceph-devel@vger.kernel.org Subject: [PATCH 1/3] *v2* librbd: copy-on-read for clones, add an option for copy-on-read Date: Tue, 13 May 2014 17:12:13 +0800 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: X-HM-Spam-Status: e1koWUFPN1dZCBgUCR5ZQU9LVUhLT0JCTU9CS09MQ05KTVdZCQ4XHghZQV koKz0kKDQ9Lz06MjckMjUkMz46Pz4pQU1VSkhCQDYjJCI#KCQyNSQzPjo*PilBS1VIT0lAKy8pJD U0JDI1JDM#Oj8#KUFJVUNOQ0A4NC41LykiJDg1QUtVSU1DQCk#PDI0NSQ6KDI6QUhVT09NQCspNC 0yNTg#JDMuNTo1QUJVQkpOQD8iNTo2MjgkMiskNTQkMjUkMz46Pz4pQUtVTENCQD8wMjYkNTQ1Pk FLVUtANi43LzIkKTgrLyQ*Mj09Pik#NS8kMjUkMz46Pz4pQU9VS0tJQDIrJEokNjI1Li8#JDg1Ly RLJEpLQUtVS0AyKyRISyQ2MjUuLz4kODUvJEskTktBS1VLQDIrJE4kNjI1Li8#JDg1LyRLJEpLQU tVS0AyKyQvND86IiQ4NS8kSyRKS0tBS1VMSk1AMiskSiQzNC4pJDg1LyRLJEpLS0FLVUtANTQvJD 06NjQuKCQ*NDY6MjUkKCs9JD06MjdBSktVS0AoLjkkPkFKVU5OQD01JCguOSQ#NSw0KT8oJDM3MS RKS0tJS0pBS1VJQ1kG X-HM-Sender-Digest: e1kSHx4VD1lBWUc6ORA6Nyo*Pzo0LjpLKj8yOjQuOjQwChVVSlVKSEJC QkxJSE9PSkxNVTMWGhIXVRYSFRgTHhU7DhkOFQ8OEAIXEhVVGBQWRVlXWQweGVlBHRoXCB5XWQgB WUFJTE5IN1dZEgtZQVlJS0lVSkJMVUJVQ1kG Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add an option rbd_clone_cor to enable copy-on-read Signed-off-by: Min Chen Signed-off-by: Li Wang Signed-off-by: Yunchuan Wen Chen --- src/common/config_opts.h | 1 + src/librbd/AioRequest.cc | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index a065a77..15438ce 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -711,6 +711,7 @@ OPTION(rbd_balance_snap_reads, OPT_BOOL, false) OPTION(rbd_localize_snap_reads, OPT_BOOL, false) OPTION(rbd_balance_parent_reads, OPT_BOOL, false) OPTION(rbd_localize_parent_reads, OPT_BOOL, true) +OPTION(rbd_clone_cor, OPT_BOOL, false)//copy-on-read option for rbd clones /* * The following options change the behavior for librbd's image creation methods that diff --git a/src/librbd/AioRequest.cc b/src/librbd/AioRequest.cc index 5cf9a11..4cc6b4e 100644 --- a/src/librbd/AioRequest.cc +++ b/src/librbd/AioRequest.cc @@ -59,6 +59,10 @@ namespace librbd { ldout(m_ictx->cct, 20) << "should_complete " << this << " " << m_oid << " " << m_object_off << "~" << m_object_len << " r = " << r << dendl; + //get copy-on-read option and check image if read_only + bool COR = (m_ictx->cct->_conf->rbd_clone_cor) && (!m_ictx->read_only); + ldout(m_ictx->cct, 20) << "should_complete COR = " << COR << " read_only = " << m_ictx->read_only << dendl; + if (!m_tried_parent && r == -ENOENT) { RWLock::RLocker l(m_ictx->snap_lock); RWLock::RLocker l2(m_ictx->parent_lock);