From patchwork Mon Feb 27 18:41:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1749093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ktgtPOCB; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PQTqF2ByWz1yX0 for ; Tue, 28 Feb 2023 05:41:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 045DE81F22; Mon, 27 Feb 2023 18:41:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 045DE81F22 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ktgtPOCB X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id prEgCe60UQMr; Mon, 27 Feb 2023 18:41:25 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 609DE81F15; Mon, 27 Feb 2023 18:41:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 609DE81F15 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3DA84C0033; Mon, 27 Feb 2023 18:41:24 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id DA098C002B for ; Mon, 27 Feb 2023 18:41:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id AED6A81F1F for ; Mon, 27 Feb 2023 18:41:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org AED6A81F1F X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pgKtDvr1zwqP for ; Mon, 27 Feb 2023 18:41:22 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D148E81F15 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by smtp1.osuosl.org (Postfix) with ESMTPS id D148E81F15 for ; Mon, 27 Feb 2023 18:41:21 +0000 (UTC) Received: by mail-lj1-x233.google.com with SMTP id by8so7495267ljb.7 for ; Mon, 27 Feb 2023 10:41:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YY7u/c8wLt3IFCa7JIjN3NZAGYCf9Aw0p6+YixiwCIY=; b=ktgtPOCBM+bBSDJF7xrWNlz5O723vRfhGI7ju64aXlJs/VNij8BOtTQCyTn3swrRJm pn5+QpKLEjx7zF2YSZdpMRl2gafOLb1wpzN0V/QRQlqe9tWUWe8EvrCK7RWjeHDyiFXU HEkqOylviABWqiXNzpDIn3kdmngjKdJtf0b+SjB7Dt/T61WQ2Clh1+mOvAk0Q33VzzFd EkAq/IujtkG/z6dYm1tAeKC4227ydqjIA4aok5ZZ2cYjYqeexCs6SSms6xCPG46elr5o lGm49DIn8bJAgxACDxHK0rF7PlKwkRRZA3AYGjROLM+VsdnB8NB/YHmTc6jMSjoPsFDD cc5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YY7u/c8wLt3IFCa7JIjN3NZAGYCf9Aw0p6+YixiwCIY=; b=dznnfc6dvw18oWhK3OvgU2EilHD+k4YAOugDe3eA7wnHGIDHXnF6BqCSNS2KOJtEKW AstSIYJJ8wFM4CkjQiQYAgiBpWms57foosG6FmpBqjlYrY/6OEoK3rwsVH8dxfc7BVSU du4iZvgN5FPPOTip69wthASNNfvpuKYLbl55jbAC0mMzg68XTOkH1i6lUQvn4sIUIoiC dqSUXLmzsq5jIxwc2PwtGJG8FwdfjjhpjEVnXZ38RLstDG3wfz6EG29eDZR3gbxSPVLq Tf+zdpZzLNxXJfepbn3xW1VCafV9fjgb9Alw/BRuchevaMA0TrD91+bKsGojbkB2TlU4 Im2g== X-Gm-Message-State: AO0yUKVPwBYVS0jhjvZMs/KV3rP9J+5hTvjc7TdYfcwAJti/vI646Sm4 srum6hnQRxNyY7ecVphhAd2CiRO1adnfMw== X-Google-Smtp-Source: AK7set+L8MPBe2jWt/uIYfhUULsO/T7Bi+82XYu8H6xytvQKozpONQoPdSuTZikCKhnSDO9/6G3SNw== X-Received: by 2002:a2e:bcc5:0:b0:295:9d97:bb1 with SMTP id z5-20020a2ebcc5000000b002959d970bb1mr136311ljp.5.1677523279412; Mon, 27 Feb 2023 10:41:19 -0800 (PST) Received: from ip-10-70-112-12.vpc-1e810be1.internal (c2-178-216-98-9.elastic.cloud.croc.ru. [178.216.98.9]) by smtp.gmail.com with ESMTPSA id s17-20020a05651c049100b0029571d2226bsm830267ljc.11.2023.02.27.10.41.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 10:41:18 -0800 (PST) From: Vladislav Odintsov To: dev@openvswitch.org Date: Mon, 27 Feb 2023 21:41:17 +0300 Message-Id: <20230227184117.3703319-1-odivlad@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Cc: Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn] rhel: pass options to stop daemon command in systemd units X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch fixes ovn-northd.service and ovn-db@.service systemd units which didn't pass startup options to ovn-ctl script while stop_* call. For instance if ovn-northd service was started with option '--ovn-manage-ovsdb=no' and NB/SB databases are located on the same host and started by ovn-db@nb / ovn-db@sb or manually with ovn-ctl, so ovsdb-server processes for these services will be unexpectedly stopped. Fixes: 497ec3fdfbdb ("rhel: add ovn-db@.service systemd-unit") Signed-off-by: Vladislav Odintsov Acked-by: Ales Musil --- rhel/usr_lib_systemd_system_ovn-db@.service | 2 +- rhel/usr_lib_systemd_system_ovn-northd.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rhel/usr_lib_systemd_system_ovn-db@.service b/rhel/usr_lib_systemd_system_ovn-db@.service index 98556a673..c835e4967 100644 --- a/rhel/usr_lib_systemd_system_ovn-db@.service +++ b/rhel/usr_lib_systemd_system_ovn-db@.service @@ -33,7 +33,7 @@ EnvironmentFile=-/etc/sysconfig/ovn-%i ExecStartPre=-/usr/bin/chown -R ${OVN_USER_ID} ${OVN_DBDIR} ExecStart=/usr/share/ovn/scripts/ovn-ctl \ --ovn-user=${OVN_USER_ID} start_%i_ovsdb $OPTIONS $ovn_%i_opts -ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_%i_ovsdb +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_%i_ovsdb $OPTIONS $ovn_%i_opts [Install] WantedBy=multi-user.target diff --git a/rhel/usr_lib_systemd_system_ovn-northd.service b/rhel/usr_lib_systemd_system_ovn-northd.service index d281f861c..6c4c6621c 100644 --- a/rhel/usr_lib_systemd_system_ovn-northd.service +++ b/rhel/usr_lib_systemd_system_ovn-northd.service @@ -26,7 +26,7 @@ EnvironmentFile=-/etc/sysconfig/ovn-northd ExecStartPre=-/usr/bin/chown -R ${OVN_USER_ID} ${OVN_DBDIR} ExecStart=/usr/share/ovn/scripts/ovn-ctl \ --ovn-user=${OVN_USER_ID} start_northd $OVN_NORTHD_OPTS -ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_northd +ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_northd $OVN_NORTHD_OPTS [Install] WantedBy=multi-user.target