From patchwork Thu Mar 27 18:18:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3899351 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 42EE5BF549 for ; Thu, 27 Mar 2014 18:19:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C4B820253 for ; Thu, 27 Mar 2014 18:19:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89A4920256 for ; Thu, 27 Mar 2014 18:19:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757203AbaC0STi (ORCPT ); Thu, 27 Mar 2014 14:19:38 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:42452 "EHLO mail-ee0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757161AbaC0STe (ORCPT ); Thu, 27 Mar 2014 14:19:34 -0400 Received: by mail-ee0-f45.google.com with SMTP id d17so3247221eek.32 for ; Thu, 27 Mar 2014 11:19:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=hGcsUlc/+YzbxD7tEf7zJa5m5tawqinW7ifNRgXo4+E=; b=DX1viYbfKjCFDJDO4rr7Aaxst4bv6ouVzHshBVfYTQhFIwbOkfJTND+IzmvCcZEwDC 5V+NJCR3JWFLZZDm6yTXuR2y2QOG2U4uHdbeRvmy1wKwitfZJ+hqQQ8japlLLaNLg41G rFjTRMYMDJ9oD2EvPjLDQ2aNuhtJ8eujCuDRcBS2KXYHXR4It4hCpa76FkzxJhcuDrJv QwTNScIQhavMe1nx9QywmutmNZ5Q2FxL93S9l9GMyYXUhonaai1EwJc7/2rBhWhtFy33 yBiOD1pT1QvNOkZdoNUDT4Co/u1c8+A9RgzOFLPXh1MEXGSI1lsEfw4F4gG339KdjYjm u+Jg== X-Gm-Message-State: ALoCoQn9vagnNvYiTPdk0LolRKZ4iycOmocPo3TLKrV8ob0Ihl/mrvHddQDfKYifRpLEHHtrHum4 X-Received: by 10.15.36.6 with SMTP id h6mr2529957eev.54.1395944373558; Thu, 27 Mar 2014 11:19:33 -0700 (PDT) Received: from localhost ([109.110.66.7]) by mx.google.com with ESMTPSA id p8sm5965332eef.26.2014.03.27.11.19.32 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Mar 2014 11:19:33 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 30/33] libceph: add support for primary_temp mappings Date: Thu, 27 Mar 2014 20:18:16 +0200 Message-Id: <1395944299-21970-31-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> References: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> 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.3 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 Change apply_temp() to override primary in the same way pg_temp overrides osd set. primary_temp overrides pg_temp primary too. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- net/ceph/osdmap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index 7193b012ee02..ed52b47d0ddb 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -1590,7 +1590,7 @@ static int raw_to_up_osds(struct ceph_osdmap *osdmap, } /* - * Given up set, apply pg_temp mapping. + * Given up set, apply pg_temp and primary_temp mappings. * * Return acting set length. *primary is set to acting primary osd id, * or -1 if acting set is empty. @@ -1637,6 +1637,11 @@ static int apply_temps(struct ceph_osdmap *osdmap, temp_primary = *primary; } + /* primary_temp? */ + pg = __lookup_pg_mapping(&osdmap->primary_temp, pgid); + if (pg) + temp_primary = pg->primary_temp.osd; + *primary = temp_primary; return temp_len; }