From patchwork Tue Jun 6 20:13:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 13269724 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4CB13C77B7A for ; Tue, 6 Jun 2023 20:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686082418; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=OMNliP1R8N2ySFzyDt2+DftMnAmLeBs4JTlGaGg+R9Y=; b=HOeYPrPyZzJVk0PkMxtNjqudh7rl2D6qIE1YbXOcNLvuxFHdt+8y+gwSyqLSJHB5A1K4YR TF+Yo7R/DtXsrJwwqEgnLY5hYOmGqHnJpYWRZJOrnNOcBEsXjgvFWljv45tsxCRpdwm63K JMdvfeB9VNXeojVa+84cfAmzlDkyYVo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-395-qknZgUuIPL-H_uIfvpHhmQ-1; Tue, 06 Jun 2023 16:13:37 -0400 X-MC-Unique: qknZgUuIPL-H_uIfvpHhmQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 775CE101A590; Tue, 6 Jun 2023 20:13:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 628E3C16047; Tue, 6 Jun 2023 20:13:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2F23C19465BD; Tue, 6 Jun 2023 20:13:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B353A19465BA for ; Tue, 6 Jun 2023 20:13:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 958D440D1B68; Tue, 6 Jun 2023 20:13:24 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 804CC40D1B66; Tue, 6 Jun 2023 20:13:24 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 356KDMG8029276; Tue, 6 Jun 2023 15:13:22 -0500 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 356KDLWU029275; Tue, 6 Jun 2023 15:13:21 -0500 From: Benjamin Marzinski To: Christophe Varoqui Date: Tue, 6 Jun 2023 15:13:07 -0500 Message-Id: <1686082391-29210-8-git-send-email-bmarzins@redhat.com> In-Reply-To: <1686082391-29210-1-git-send-email-bmarzins@redhat.com> References: <1686082391-29210-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Subject: [dm-devel] [PATCH V2 07/11] libmultipath: don't count PRIO_UNDEF paths for pathgroup priority X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: device-mapper development , Martin Wilck MIME-Version: 1.0 Errors-To: dm-devel-bounces@redhat.com Sender: "dm-devel" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com When multipath is not set to group_by_prio, different paths in a pathgroup can have different priorities. If there is a problem getting the priority of an active path, its priority will be set to PRIO_UNDEF. This will change the priority of the whole pathgroup, even though it's likely that this is simply a temporary error. Instead, do not count PRIO_UNDEF paths towards to priority of the path group, unless there are no paths that have an actual priority. This will not effect the priority of multipath devices with group_by_prio, since all paths in a pathgroup will have the same priority. Reviewed-by: Martin Wilck Signed-off-by: Benjamin Marzinski --- libmultipath/switchgroup.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libmultipath/switchgroup.c b/libmultipath/switchgroup.c index 6fdfcfa7..b1e1f39b 100644 --- a/libmultipath/switchgroup.c +++ b/libmultipath/switchgroup.c @@ -12,6 +12,7 @@ void path_group_prio_update(struct pathgroup *pgp) int i; int priority = 0; int marginal = 0; + int defined_prios = 0; struct path * pp; pgp->enabled_paths = 0; @@ -24,12 +25,17 @@ void path_group_prio_update(struct pathgroup *pgp) marginal++; if (pp->state == PATH_UP || pp->state == PATH_GHOST) { - priority += pp->priority; + if (pp->priority != PRIO_UNDEF) { + defined_prios++; + priority += pp->priority; + } pgp->enabled_paths++; } } - if (pgp->enabled_paths) - pgp->priority = priority / pgp->enabled_paths; + if (defined_prios) + pgp->priority = priority / defined_prios; + else if (pgp->enabled_paths) + pgp->priority = PRIO_UNDEF; else pgp->priority = 0; if (marginal && marginal == i)