From patchwork Fri Jan 29 19:02:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 575805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id E4B40140557 for ; Sat, 30 Jan 2016 06:14:25 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 386B910DBA; Fri, 29 Jan 2016 11:14:24 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 1880310D50 for ; Fri, 29 Jan 2016 11:14:23 -0800 (PST) Received: from bar4.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 2F6F1162D9B for ; Fri, 29 Jan 2016 12:14:22 -0700 (MST) X-ASG-Debug-ID: 1454094861-03dc217d9bc32570001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar4.cudamail.com with ESMTP id tZAmgggdVx9HA7nW (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 29 Jan 2016 12:14:21 -0700 (MST) X-Barracuda-Envelope-From: guru.ovn@gmail.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pf0-f177.google.com) (209.85.192.177) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 29 Jan 2016 19:14:21 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at _netblocks.google.com designates 209.85.192.177 as permitted sender) X-Barracuda-RBL-Trusted-Forwarder: 209.85.192.177 Received: by mail-pf0-f177.google.com with SMTP id o185so41876075pfb.1 for ; Fri, 29 Jan 2016 11:14:21 -0800 (PST) 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; bh=PHx2lgUFk6qUWHcSIQzocz6wZrqkk6pySyqB2xtF/XQ=; b=m8tF+ckM4DoXWZhxfA4O004Qz5rgCv1IZLDCpdYE41VvjQYvLws7iRqoPEK62Q2N/I +sHEV2mVyf0hHBSu7Fm1GFelRiSFoBiLr9Tmaj9DwLkrU069Qzg2M8DZjSveyEW3ynuN Ci0uA6ROWMaSIQsQ40Z9DcYFcmYUBC0QXCRkxvyhguKMqOEJHRVpjhFdTP4c4TJBF246 OJvUcOyRuPYKVnoPTBly2SOXsTdmW85sJoRc4RAddBRZcOxIwq8WrOnm1ynMlkV2Masu zjwUsxKvqWw86lMQrdFdmSby6GX8Ey9G5bC6DOD7j+M6KkRM0qrYU7fIA35tNAG+h0U6 7HAQ== X-Gm-Message-State: AG10YORcwaGN7kQObJfseNbjU4bxPcWf+u5h6L3MJupq+9zh92zdkl1lJ9idSWQLkqs+bg== X-Received: by 10.98.32.194 with SMTP id m63mr15769814pfj.27.1454094860893; Fri, 29 Jan 2016 11:14:20 -0800 (PST) Received: from ubuntu-test.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id dg12sm25227718pac.47.2016.01.29.11.14.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 29 Jan 2016 11:14:19 -0800 (PST) X-CudaMail-Envelope-Sender: guru.ovn@gmail.com X-Barracuda-Apparent-Source-IP: 208.91.1.34 From: Gurucharan Shetty To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-128054575 X-CudaMail-DTE: 012916 X-CudaMail-Originating-IP: 209.85.192.177 Date: Fri, 29 Jan 2016 11:02:41 -0800 X-ASG-Orig-Subj: [##CM-E2-128054575##][PATCH] Revert "ovs-lib: Try to call exit before killing." Message-Id: <1454094161-27707-1-git-send-email-guru@ovn.org> X-Mailer: git-send-email 1.7.9.5 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1454094861 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Edgar Cantu Subject: [ovs-dev] [PATCH] Revert "ovs-lib: Try to call exit before killing." X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" This reverts commit 9b5422a98f817b9f2a1f8224cab7e1a8d0bbba1f. Reason: Calling 'ovs-appctl exit' on ovs-vswitchd will cause ovs-vswitchd to destroy all the ports from the datapath. This is an unacceptable behavior while restarting the daemons. Couple of reasons that come to mind are: 1. Any configured ip addresses will be lost 2. Traffic will stop flowing. Reported-by: Edgar Cantu Signed-off-by: Gurucharan Shetty --- AUTHORS | 1 + utilities/ovs-lib.in | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/AUTHORS b/AUTHORS index 7ae64d3..a92b94f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -277,6 +277,7 @@ David Palma palma@onesource.pt Derek Cormier derek.cormier@lab.ntt.co.jp Dhaval Badiani dbadiani@vmware.com DK Moon dkmoon@nicira.com +Edgar Cantu eocantu@us.ibm.com Edwin Chiu echiu@vmware.com Eivind Bulie Haanaes Eric Lopez elopez@nicira.com diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in index 773efb3..dd8a1e9 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -202,18 +202,11 @@ start_daemon () { stop_daemon () { if test -e "$rundir/$1.pid"; then if pid=`cat "$rundir/$1.pid"`; then - for action in EXIT .1 .25 .65 1 \ - TERM .1 .25 .65 1 1 1 1 \ - KILL 1 1 1 2 10 15 30 \ - FAIL; do + for action in TERM .1 .25 .65 1 1 1 1 KILL 1 1 1 2 10 15 30 FAIL; do if pid_exists "$pid" >/dev/null 2>&1; then :; else return 0 fi case $action in - EXIT) - action "Exiting $1 ($pid)" \ - ${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl exit - ;; TERM) action "Killing $1 ($pid)" kill $pid ;;