From patchwork Thu Apr 28 17:33:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 8973871 Return-Path: X-Original-To: patchwork-fstests@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 74E709F1D3 for ; Thu, 28 Apr 2016 17:34:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 183E0202E5 for ; Thu, 28 Apr 2016 17:34:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13F30202E9 for ; Thu, 28 Apr 2016 17:34:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753208AbcD1Rd7 (ORCPT ); Thu, 28 Apr 2016 13:33:59 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33970 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753336AbcD1Rdu (ORCPT ); Thu, 28 Apr 2016 13:33:50 -0400 Received: by mail-pa0-f52.google.com with SMTP id r5so34903597pag.1 for ; Thu, 28 Apr 2016 10:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=yU6ZPdTFUf6uIeADCvHPlCT/uHSzhxuv1D2VQV4SxpM=; b=jupf9suP1/PDIdAJ9QOQ/ehUc1hk9YVCot6q2KV6MmU/6/qSuyefe4IVh1xN4Pacmt ICVqIApkOnHA2Juxwaz8kyJZAc/bYnVOGFaobQf/+tUO6yczK8uew+fGm6IeJnTJGtpT QeEF/0F1lRrAqA4S5KHfCpP9kxSSNMkk3vcePKE/ixDl4CrsxdVjGam+6T7vYE2wjx/D nyQKtwRhioE6Qy+gpeLoJcZZlFypJaJWu+7Q7h3Cveef6SNB5gu8Mr06tM+rrdwVFFhk V/4YZVXXQbCzX1wVVRuoule6EYCaBEq37wO4ilj/Pj36W62+lv47LmMSi1lF8e+91gqR D2rw== 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:in-reply-to:references; bh=yU6ZPdTFUf6uIeADCvHPlCT/uHSzhxuv1D2VQV4SxpM=; b=PG88k9Q8CASYX2tLSqJJf2JKaQsrYJTnhNxxj8CYxXMdkAOFM19+DP37OzORa8qyxh VWp5VPvQkv9lZzK1ojaJ1VykYTe6OH7XhFCL58mo4AQniIKGozEO5by+wxTDkbXfimcU 6xxf0o0J4oN12gPMqFB4IjJqc4W/0MRek7uh0WHARKiVfPSNMoPY1d2Rauw8DijlINCS 4I171ENF9qejZqWYsjK8pnDLCsG6fAkT2LEedocbLb8wtBoqGBOP+BlhNMEPS7Wp0VLL zMKtOMJYVbNplzj0L1uXbKcCn1MgzmX2LexUcUkyRMcLTXeA/GWTS4ZSx2GrjmbZymvx EpPQ== X-Gm-Message-State: AOPr4FUft4v332jcMsCnJKb7K12a9Y6NSVvuwSaEq7A8i/6oJi9w4UqvB4VMGeKEPxxGYhYu X-Received: by 10.66.176.103 with SMTP id ch7mr16053711pac.20.1461864829592; Thu, 28 Apr 2016 10:33:49 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::c:8cff]) by smtp.gmail.com with ESMTPSA id ba9sm16842886pab.24.2016.04.28.10.33.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Apr 2016 10:33:48 -0700 (PDT) From: Omar Sandoval X-Google-Original-From: Omar Sandoval To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Cc: kernel-team@fb.com, Omar Sandoval Subject: [PATCH v2 1/2] btrfs: add replace missing and replace RAID 5/6 to profile configs Date: Thu, 28 Apr 2016 10:33:36 -0700 Message-Id: <776782f53c3639730a9813a91babb6da57530ab0.1461864695.git.osandov@fb.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: References: In-Reply-To: References: Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 From: Omar Sandoval Replacing and scrubbing RAID 5/6 is now supported on Btrfs. Enable it in _btrfs_get_profile_configs while making it more generic to also support replace missing. Reviewed-by: Eryu Guan Signed-off-by: Omar Sandoval --- common/rc | 95 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/common/rc b/common/rc index 8bec836805c6..91e8f1c8e693 100644 --- a/common/rc +++ b/common/rc @@ -3207,60 +3207,61 @@ _btrfs_get_profile_configs() return fi - # no user specified btrfs profile configs, export the default configs if [ -z "$BTRFS_PROFILE_CONFIGS" ]; then - # default configs - _btrfs_profile_configs=( - "-m single -d single" - "-m dup -d single" - "-m raid0 -d raid0" - "-m raid1 -d raid0" - "-m raid1 -d raid1" - "-m raid10 -d raid10" - "-m raid5 -d raid5" - "-m raid6 -d raid6" + # Default configurations to test. + local configs=( + "single:single" + "dup:single" + "raid0:raid0" + "raid1:raid0" + "raid1:raid1" + "raid10:raid10" + "raid5:raid5" + "raid6:raid6" ) + else + # User-provided configurations. + local configs=(${BTRFS_PROFILE_CONFIGS[@]}) + fi - # remove dup/raid5/raid6 profiles if we're doing device replace - # dup profile indicates only one device being used (SCRATCH_DEV), - # but we don't want to replace SCRATCH_DEV, which will be used in - # _scratch_mount/_check_scratch_fs etc. - # and raid5/raid6 doesn't support replace yet + _btrfs_profile_configs=() + for cfg in "${configs[@]}"; do + local supported=true + local profiles=(${cfg/:/ }) if [ "$1" == "replace" ]; then - _btrfs_profile_configs=( - "-m single -d single" - "-m raid0 -d raid0" - "-m raid1 -d raid0" - "-m raid1 -d raid1" - "-m raid10 -d raid10" - # add these back when raid5/6 is working with replace - #"-m raid5 -d raid5" - #"-m raid6 -d raid6" + # We can't do replace with these profiles because they + # imply only one device ($SCRATCH_DEV), and we need to + # keep $SCRATCH_DEV around for _scratch_mount + # and _check_scratch_fs. + local unsupported=( + "dup" ) + elif [ "$1" == "replace-missing" ]; then + # We can't replace missing devices with these profiles + # because there isn't enough redundancy. + local unsupported=( + "single" + "dup" + "raid0" + ) + else + local unsupported=() fi - export _btrfs_profile_configs - return - fi - - # parse user specified btrfs profile configs - local i=0 - local cfg="" - for cfg in $BTRFS_PROFILE_CONFIGS; do - # turn "metadata:data" format to "-m metadata -d data" - # and assign it to _btrfs_profile_configs array - cfg=`echo "$cfg" | sed -e 's/^/-m /' -e 's/:/ -d /'` - _btrfs_profile_configs[$i]="$cfg" - let i=i+1 - done - - if [ "$1" == "replace" ]; then - if echo ${_btrfs_profile_configs[*]} | grep -q raid[56]; then - _notrun "RAID5/6 doesn't support btrfs device replace yet" - fi - if echo ${_btrfs_profile_configs[*]} | grep -q dup; then - _notrun "Do not set dup profile in btrfs device replace test" + for unsupp in "${unsupported[@]}"; do + if [ "${profiles[0]}" == "$unsupp" -o "${profiles[1]}" == "$unsupp" ]; then + if [ -z "$BTRFS_PROFILE_CONFIGS" ]; then + # For the default config, just omit it. + supported=false + else + # For user-provided config, don't run the test. + _notrun "Profile $unsupp not supported for $1" + fi + fi + done + if "$supported"; then + _btrfs_profile_configs+=("-m ${profiles[0]} -d ${profiles[1]}") fi - fi + done export _btrfs_profile_configs }