From patchwork Thu Mar 21 23:06:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1060568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="klgLPxb7"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44QMsw6Pmxz9sS0 for ; Fri, 22 Mar 2019 10:08:51 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 46C27F11; Thu, 21 Mar 2019 23:08:47 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 30A6EEC7 for ; Thu, 21 Mar 2019 23:08:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A9599D3 for ; Thu, 21 Mar 2019 23:08:24 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id v21so116961pfm.12 for ; Thu, 21 Mar 2019 16:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=HJN6Y9mpqe4jaQSHIfl6tv9b8hNwyf59sGOiC9X4pnQ=; b=klgLPxb78ueecJWRM7thj5oOniioSWvkel7etrsk5EnTOrj75KCb6COSTW0sFnIGYO 01lUopktWbIq9irD3AqBh9YtPzo5eqgRLg1ETS0NrFD94ithoRQpYQ1DVdGZO7pq+rmR MmBPlDd9+j2vaGjPGCAbmKYC7rOMKNnbI4hSMmy/moNqusPLq2XJoAIBgLjFkHuKZBou qwcfblNU7+4kljgRDUIuoba02kfwTVmWxyECbHSIoSMNHGuJKebti+da/zZP0wodln7O 7/lr88RgLt04dL4vu9cOfROIEZ1tHrw+nVNbE7aC8AnAJmjTc8o6VYF7IoCvybaropAh facQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HJN6Y9mpqe4jaQSHIfl6tv9b8hNwyf59sGOiC9X4pnQ=; b=Oys9wQ3mCFIk10NZB63N7ioPzSONGlvNwDn7wFfdsMrLd95WEGtxKN2eF5R/aWuFfY Itymho8jeElA5+mRmNl3dnTiJCIewrXVsFnTPZfLi1uYP1bH2lyL0qxZerf1cGtsYgsB 1Z9QaCr71TPNxAVPEd9T1HjGIGkeXdLnhMqCZNNJIugOMqDGZ7FdVXRsCO144DJsxosr APfgMbtqYYdep6VtGfzwyouh8EhtsKZpQ99EyoC7ldtni3lfx9//tv5IPPHhJtHd15UA bIs7cfo5VlZhrg9g4p7R814cLp0vimqodhDI/qBlywDjkg5ApdMYKGP7IyvyJ4jP7fr0 euHQ== X-Gm-Message-State: APjAAAUqpg1Czjz5CpHKuOrQ/JCLNLevkq3hlTHQPhaw3N9XEEKv23Xm xBMLmg8ucZW6xJXDoyWG0C22h3p9 X-Google-Smtp-Source: APXvYqygmRa0zRXo4Q9u8bToE+Lp4KF3JwO/Z2HHZfqaouYhxvmrjz1kkfJVP+x7qWjtUKRq+u749Q== X-Received: by 2002:a63:4142:: with SMTP id o63mr5703627pga.81.1553209703947; Thu, 21 Mar 2019 16:08:23 -0700 (PDT) Received: from localhost.localdomain.localdomain ([216.113.160.71]) by smtp.gmail.com with ESMTPSA id c2sm11424034pfm.187.2019.03.21.16.08.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 16:08:23 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Thu, 21 Mar 2019 16:06:30 -0700 Message-Id: <1553209591-121446-1-git-send-email-hzhou8@ebay.com> X-Mailer: git-send-email 2.1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 1/2] ovn-ctl: Unify OVN_RUNDIR usage. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Han Zhou In this script $rundir and $OVN_RUNDIR is used in a mixed way, which can cause different folders used for different runtime files. This patch unifies the usage to the correct one. Signed-off-by: Han Zhou --- ovn/utilities/ovn-ctl | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/ovn/utilities/ovn-ctl b/ovn/utilities/ovn-ctl index 9e49d1d..83f026e 100755 --- a/ovn/utilities/ovn-ctl +++ b/ovn/utilities/ovn-ctl @@ -40,13 +40,13 @@ pidfile_is_running () { stop_nb_ovsdb() { if pidfile_is_running $DB_NB_PID; then - ovs-appctl -t $rundir/ovnnb_db.ctl exit + ovs-appctl -t $OVN_RUNDIR/ovnnb_db.ctl exit fi } stop_sb_ovsdb() { if pidfile_is_running $DB_SB_PID; then - ovs-appctl -t $rundir/ovnsb_db.ctl exit + ovs-appctl -t $OVN_RUNDIR/ovnsb_db.ctl exit fi } @@ -61,8 +61,8 @@ demote_ovnnb() { fi if test -e $ovnnb_active_conf_file; then - ovs-appctl -t $rundir/ovnnb_db.ctl ovsdb-server/set-active-ovsdb-server `cat $ovnnb_active_conf_file` - ovs-appctl -t $rundir/ovnnb_db.ctl ovsdb-server/connect-active-ovsdb-server + ovs-appctl -t $OVN_RUNDIR/ovnnb_db.ctl ovsdb-server/set-active-ovsdb-server `cat $ovnnb_active_conf_file` + ovs-appctl -t $OVN_RUNDIR/ovnnb_db.ctl ovsdb-server/connect-active-ovsdb-server else echo >&2 "$0: active server details not set" exit 1 @@ -75,8 +75,8 @@ demote_ovnsb() { fi if test -e $ovnsb_active_conf_file; then - ovs-appctl -t $rundir/ovnsb_db.ctl ovsdb-server/set-active-ovsdb-server `cat $ovnsb_active_conf_file` - ovs-appctl -t $rundir/ovnsb_db.ctl ovsdb-server/connect-active-ovsdb-server + ovs-appctl -t $OVN_RUNDIR/ovnsb_db.ctl ovsdb-server/set-active-ovsdb-server `cat $ovnsb_active_conf_file` + ovs-appctl -t $OVN_RUNDIR/ovnsb_db.ctl ovsdb-server/connect-active-ovsdb-server else echo >&2 "$0: active server details not set" exit 1 @@ -85,12 +85,12 @@ demote_ovnsb() { promote_ovnnb() { rm -f $ovnnb_active_conf_file - ovs-appctl -t $rundir/ovnnb_db.ctl ovsdb-server/disconnect-active-ovsdb-server + ovs-appctl -t $OVN_RUNDIR/ovnnb_db.ctl ovsdb-server/disconnect-active-ovsdb-server } promote_ovnsb() { rm -f $ovnsb_active_conf_file - ovs-appctl -t $rundir/ovnsb_db.ctl ovsdb-server/disconnect-active-ovsdb-server + ovs-appctl -t $OVN_RUNDIR/ovnsb_db.ctl ovsdb-server/disconnect-active-ovsdb-server } start_ovsdb__() { @@ -244,7 +244,7 @@ start_ovsdb () { } sync_status() { - ovs-appctl -t $rundir/ovn${1}_db.ctl ovsdb-server/sync-status | awk '{if(NR==1) print $2}' + ovs-appctl -t $OVN_RUNDIR/ovn${1}_db.ctl ovsdb-server/sync-status | awk '{if(NR==1) print $2}' } status_ovnnb() { @@ -428,8 +428,11 @@ restart_sb_ovsdb () { set_defaults () { OVN_MANAGE_OVSDB=yes - DB_NB_SOCK=$rundir/ovnnb_db.sock - DB_NB_PID=$rundir/ovnnb_db.pid + OVS_RUNDIR=${OVS_RUNDIR:-${rundir}} + OVN_RUNDIR=${OVN_RUNDIR:-${OVS_RUNDIR}} + + DB_NB_SOCK=$OVN_RUNDIR/ovnnb_db.sock + DB_NB_PID=$OVN_RUNDIR/ovnnb_db.pid DB_NB_FILE=$dbdir/ovnnb_db.db DB_NB_ADDR=0.0.0.0 DB_NB_PORT=6641 @@ -437,8 +440,8 @@ set_defaults () { DB_NB_SYNC_FROM_ADDR= DB_NB_SYNC_FROM_PORT=6641 - DB_SB_SOCK=$rundir/ovnsb_db.sock - DB_SB_PID=$rundir/ovnsb_db.pid + DB_SB_SOCK=$OVN_RUNDIR/ovnsb_db.sock + DB_SB_PID=$OVN_RUNDIR/ovnsb_db.pid DB_SB_FILE=$dbdir/ovnsb_db.db DB_SB_ADDR=0.0.0.0 DB_SB_PORT=6642 @@ -449,7 +452,7 @@ set_defaults () { DB_NB_SCHEMA=$datadir/ovn-nb.ovsschema DB_SB_SCHEMA=$datadir/ovn-sb.ovsschema - DB_SOCK=$rundir/db.sock + DB_SOCK=$OVN_RUNDIR/db.sock DB_CONF_FILE=$dbdir/conf.db OVN_NORTHD_PRIORITY=-10 @@ -457,8 +460,6 @@ set_defaults () { OVN_CONTROLLER_PRIORITY=-10 OVN_CONTROLLER_WRAPPER= - OVS_RUNDIR=${OVS_RUNDIR:-${rundir}} - OVN_RUNDIR=${OVN_RUNDIR:-${OVS_RUNDIR}} OVN_USER= OVS_USER=