From patchwork Wed Feb 3 14:23:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 8203741 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0A1DC9F38B for ; Wed, 3 Feb 2016 14:23:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2438B202BE for ; Wed, 3 Feb 2016 14:23:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FFF4202D1 for ; Wed, 3 Feb 2016 14:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754138AbcBCOXh (ORCPT ); Wed, 3 Feb 2016 09:23:37 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:38419 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753809AbcBCOXd (ORCPT ); Wed, 3 Feb 2016 09:23:33 -0500 Received: by mail-wm0-f52.google.com with SMTP id p63so72743405wmp.1 for ; Wed, 03 Feb 2016 06:23:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n/RIZDIgpmlc/3CnUqsYWB5SRvzKPpMsLB94p6X5kGU=; b=Rg3yG7Z0eBTvv17hcaeAdQdQlbueB0+ZNYKufRfNqtcVBILTd8oUW4vdrt7OMfFBIw 9b2VCYK9c4KfppaMl5pCxza2Rp+zCquJ2Oh6cehgEA7J296ozFrMGIP33CxMMO6PqKdD yrVFxkm6/78ZYc6xQ9B7yyeni7uIw/Tz7GfzZ5p60Qxtn9BxbWku5Mk3D3lv85YpsuVr zp7YoYLnKimasZb/8HTRPLrdTnk3dGq2e8OPMqRqqZqp7QGBrh7q58TTtwti/nXoUbKr 5iE0eLniFfUvlXidmCZHLBnWDBVlFw1O7uENlz1hemT27DLf+W3pK84a5rMPRMv8Tn1S ydjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n/RIZDIgpmlc/3CnUqsYWB5SRvzKPpMsLB94p6X5kGU=; b=N0UJlD4u2C0aMQ+h74OAmndbEl7o+OHFajHM8WWc2t0G9J5EoliMw7vq6bbiceU5mb 2znSnQOMoGMiDy/IaT6Zi5gcfC0fZddvmP06Z0uZyJKwcr07uh6tyfjFAUxlaTLXhdDn beQ6egyz4R4IUGMOUm519BA3s0dgyjcNd7yLy/TcsbnzywPPY412eUU6bi6PIYdtREMu WE6iAVa3iKLgir9ehhM3uHHIbSJTf3D4lzOybX+ZNnQa793eIzqNpyaM401uI3+/A4+U uORFs0TFP7EvgnaSBB5vkc9mZ397+SiD6xN8gozYMgRt+XiZU/sJ3Zp6LHqPSHpdQSeK JzCQ== X-Gm-Message-State: AG10YOSWYhFoThsvdxPX8HO1JKFlXBXaoO1WAyVQj2jtdrO5wx7dEwSvOZummwep27e/KA== X-Received: by 10.28.226.6 with SMTP id z6mr2339430wmg.44.1454509412795; Wed, 03 Feb 2016 06:23:32 -0800 (PST) Received: from dhcp-27-199.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id q75sm21838841wmd.6.2016.02.03.06.23.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Feb 2016 06:23:32 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Sage Weil Subject: [PATCH 5/5] libceph: advertise support for TUNABLES5 Date: Wed, 3 Feb 2016 15:23:21 +0100 Message-Id: <1454509401-19734-6-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1454509401-19734-1-git-send-email-idryomov@gmail.com> References: <1454509401-19734-1-git-send-email-idryomov@gmail.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.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 TUNABLES5 feature (chooseleaf_stable tunable) to a set of features supported by default. Signed-off-by: Ilya Dryomov --- include/linux/ceph/ceph_features.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h index fa3f82aae3be..6b4b059c158f 100644 --- a/include/linux/ceph/ceph_features.h +++ b/include/linux/ceph/ceph_features.h @@ -63,6 +63,16 @@ #define CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY (1ULL<<49) // duplicated since it was introduced at the same time as MIN_SIZE_RECOVERY #define CEPH_FEATURE_OSD_PROXY_FEATURES (1ULL<<49) /* overlap w/ above */ +#define CEPH_FEATURE_MON_METADATA (1ULL<<50) +#define CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT (1ULL<<51) /* can sort objs bitwise */ +#define CEPH_FEATURE_OSD_PROXY_WRITE_FEATURES (1ULL<<52) +#define CEPH_FEATURE_ERASURE_CODE_PLUGINS_V3 (1ULL<<53) +#define CEPH_FEATURE_OSD_HITSET_GMT (1ULL<<54) +#define CEPH_FEATURE_HAMMER_0_94_4 (1ULL<<55) +#define CEPH_FEATURE_NEW_OSDOP_ENCODING (1ULL<<56) /* New, v7 encoding */ +#define CEPH_FEATURE_MON_STATEFUL_SUB (1ULL<<57) /* stateful mon subscription */ +#define CEPH_FEATURE_MON_ROUTE_OSDMAP (1ULL<<57) /* peon sends osdmaps */ +#define CEPH_FEATURE_CRUSH_TUNABLES5 (1ULL<<58) /* chooseleaf stable mode */ /* * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature @@ -109,7 +119,8 @@ static inline u64 ceph_sanitize_features(u64 features) CEPH_FEATURE_CRUSH_TUNABLES3 | \ CEPH_FEATURE_OSD_PRIMARY_AFFINITY | \ CEPH_FEATURE_MSGR_KEEPALIVE2 | \ - CEPH_FEATURE_CRUSH_V4) + CEPH_FEATURE_CRUSH_V4 | \ + CEPH_FEATURE_CRUSH_TUNABLES5) #define CEPH_FEATURES_REQUIRED_DEFAULT \ (CEPH_FEATURE_NOSRCADDR | \