From patchwork Sun Apr 15 22:39:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aginwala aginwala X-Patchwork-Id: 904894 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="c2UmFl1b"; 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 40WpYr3tJlz9ryr for ; Thu, 26 Apr 2018 17:27:44 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1FDBC499; Thu, 26 Apr 2018 07:27:42 +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 B55083C1 for ; Thu, 26 Apr 2018 07:27:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f169.google.com (mail-pf0-f169.google.com [209.85.192.169]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 7463A2C4 for ; Thu, 26 Apr 2018 07:27:40 +0000 (UTC) Received: by mail-pf0-f169.google.com with SMTP id l27so17548566pfk.12 for ; Thu, 26 Apr 2018 00:27:40 -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=qXPf/gBQgVTiYFBkiwcA5+RLM91sHiPBGqW3eVDlTGk=; b=c2UmFl1b8I1L1+K12Jgvnj5wocGknOWOMQ0mIgqWrAtP8mNzn6RtUoatGNhJ76LNlP NNakk2xnyfUrJJDjTecYepkKraqcZFW7Jaek5v3fvfOmamK9XAw0Wl4aYWjxMmbXKT7M AztxBozLKbAKd4GUERYRCjpVUTnL49Rp5K3NqJwhiKAgoPCegrCIL5LU+CtjalqAoYha b4LKWHOWLQA4wRGKHK9eREBK1M0i0SGFFGRaXz41G8XO4griNXcHlwGem4MxejmVvpiS yizQNDUCyz2yQnzIaWl2rZc1/RwUxcsJDEkXl72JNxkpEiPf539oWUwheggs6ZnLrSxv eUKQ== 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=qXPf/gBQgVTiYFBkiwcA5+RLM91sHiPBGqW3eVDlTGk=; b=R0A07KLVgFmFufUujQE8K1tXmgEucv+ADjvzc85klPD6S2nV91BZ1BRuTVyrUI9WfF 5429NelLMYgewabIQdayXCyKEk81u7C8rKcWOpNQYC42vkmABTWh72lkaeGLmCmTtLbw MdWnYT9MJqxcTJ0w+BLBkkBoWzvldRTTQ/ctDUGbXH92qHkR3hHGlLuNFV0FlkBl453r lU4U9H7LAWgkIs5QY+hLKX15teAP1X1Dfzcf2nAq0QOmLAEEpVq9/ETjjRKgffLb+wEz VXwQj0nacuIZnUUPmZVZrYZalljEP5ZhH93BDltu5hU3F+o9SSXGXO8j+YPxINaETuOc 15aw== X-Gm-Message-State: ALQs6tDK6Elo8VtQFOuVjEIF/gyDoejRA9dxeoNrzcMZOUSeUA/6uakV zGbndKRhuD0VSP2lmEon2BO3ZA== X-Google-Smtp-Source: AB8JxZqKX5IjrxS/NQ+mKhd4Tchql0yhNYart9RZlkMRbMG603YtwjuCsW6Fz6UwYirHzujmS0pIjw== X-Received: by 2002:a17:902:bc4a:: with SMTP id t10-v6mr6244266plz.343.1524727659862; Thu, 26 Apr 2018 00:27:39 -0700 (PDT) Received: from ubuntu.hsd1.ca.comcast.net (c-73-162-228-254.hsd1.ca.comcast.net. [73.162.228.254]) by smtp.gmail.com with ESMTPSA id z13sm46153691pfk.156.2018.04.26.00.27.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Apr 2018 00:27:39 -0700 (PDT) From: aginwala X-Google-Original-From: aginwala To: dev@openvswitch.org Date: Sun, 15 Apr 2018 15:39:19 -0700 Message-Id: <1523831959-11809-1-git-send-email-aginwala@ebay.com> X-Mailer: git-send-email 1.9.1 X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_00, DATE_IN_PAST_96_XX, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: aginwala Subject: [ovs-dev] [PATCH v2] ovn-ctl: Handle whitespaces when using eval for start_ovsdb: 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 eval doesn't understand white space for local var which was introduced in commit 79c7961b8b3c4b7ea0251dea2ffacfa84c84fecb for starting clustered ovn dbs. As ovn-ctl uses sh instead of bash, parsing local var with white space will fail. e.g. /usr/share/openvswitch/scripts/ovn-ctl --db-nb-addr=192.168.220.101 --db-nb-create-insecure-remote=yes \ --db-sb-addr=192.168.220.101 --db-sb-create-insecure-remote=yes \ --db-nb-cluster-local-addr=192.168.220.101 \ --db-sb-cluster-local-addr=192.168.220.101 \ --ovn-northd-nb-db=tcp:192.168.220.101:6641,tcp:192.168.220.102:6641,tcp:192.168.220.103:6641 \ --ovn-northd-sb-db=tcp:192.168.220.101:6642,tcp:192.168.220.102:6642,tcp:192.168.220.103:6642 \ start_northd gives error: /usr/share/openvswitch/scripts/ovn-ctl: 1: local: -vfile:info: bad variable name As a result ovsdb fails to even initialize and start. Hence, we need to remove local keyword for log variable to make it work with both sh and bash. Signed-off-by: aginwala --- ovn/utilities/ovn-ctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovn/utilities/ovn-ctl b/ovn/utilities/ovn-ctl index 25dda52..43b1675 100755 --- a/ovn/utilities/ovn-ctl +++ b/ovn/utilities/ovn-ctl @@ -108,7 +108,7 @@ start_ovsdb__() { eval local file=\$DB_${DB}_FILE eval local schema=\$DB_${DB}_SCHEMA eval local logfile=\$OVN_${DB}_LOGFILE - eval local log=\$OVN_${DB}_LOG + eval log=\$OVN_${DB}_LOG eval local sock=\$DB_${DB}_SOCK eval local detach=\$DB_${DB}_DETACH eval local create_insecure_remote=\$DB_${DB}_CREATE_INSECURE_REMOTE