From patchwork Mon Aug 5 07:28:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1142029 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="viHtJH5P"; 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 4628XP1pv1z9s7T for ; Mon, 5 Aug 2019 17:29:08 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 3C867C52; Mon, 5 Aug 2019 07:29:05 +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 63563C51 for ; Mon, 5 Aug 2019 07:29:04 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3F8BE829 for ; Mon, 5 Aug 2019 07:29:03 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id t132so39248599pgb.9 for ; Mon, 05 Aug 2019 00:29:03 -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=L4rplrPLyJPmwtwW5Xu0cthW+tAY0IQfkJgVcABbnAs=; b=viHtJH5PIfAJDFuB3B45dpxoPuYi90bYP6BX5YRHzJZRosyBrHsZWCrjpAkCiH8IxR 4nI/75Mjj2jHYg1upj2LlIfn67hWSOFrJktn6KXM1r121JrOraSrkqYsIQznxLE5xpVb KJDitJ9fmnp6VADrBORjqwyTa7TJP5Lf1oQCO7b73aCIcKSNjjj8U5Y0U3WMtpO633XU /1c41DDDvQROtdxjDqUupPzVS602pDCeUskHINYH+Ki5HAjgTBM0fcvbAkoL+90meMJY 461WhH1TaFgptijbKfabpMzXKQC3M7E1URwULG031LfRnK6JUglbqHC2Vd61JOWfGD9b lCbA== 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=L4rplrPLyJPmwtwW5Xu0cthW+tAY0IQfkJgVcABbnAs=; b=H4v5AQ2UUYDWgwCymwn3ZgQTMJ8C5g5mBxUEFNBnqKCwgBP/YULnX3jBoOhYGIEAaR jL1/UekwdpJryrFrLoZeqIu1/32BzTL+zt0SLa0+suLNolrcEVJWEPDRVcyvzpGbFxdM WmeqUbrboshZaFPbsX0LsuVXdPajpAHNp/HT8kYND3aZx6pFFR0EHfdMCo/PXm0RyH3s 6sv7fbSpZyJzCREEB5jsx/Uyvnf8v3qNn6tlGshbwnWEV/Jhx3++VbrgHQRO/EPmE5M/ jocm72QmkeUs3aZNf54KM56Fd7SivRKf6QpfL/cre8EC+eP/hUNOsEj037O5wAoEipvM 86uQ== X-Gm-Message-State: APjAAAU00ueok4GnLuUqZ6QmxmQf8anS7+A0etIb9uW8TOKiAZJUbFbk 58czqccBsswCMx+4kwNtSNcLVEWTD8U= X-Google-Smtp-Source: APXvYqwb4fzKz/sVFfQ5SDEAJi3Y//0OttBcgNjFx0iAEhMuBOx9H8hZzxmDrQgP6m93C/VRZV43BQ== X-Received: by 2002:a63:ee08:: with SMTP id e8mr82089069pgi.70.1564990142529; Mon, 05 Aug 2019 00:29:02 -0700 (PDT) Received: from localhost.localdomain.localdomain ([73.241.94.255]) by smtp.gmail.com with ESMTPSA id c130sm79465776pfc.184.2019.08.05.00.29.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Aug 2019 00:29:02 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Mon, 5 Aug 2019 00:28:54 -0700 Message-Id: <1564990134-98325-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 ovn] ovn-controller: Fix inject-pkt command error response. 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 When using unixctl command inject-packet, it always respond with failure "server not ready", although the command was actually executed successfully. Fixes: 0bd4d85c36ef ("ovn-controller: Initial use of incremental engine - quiet mode.") Signed-off-by: Han Zhou Acked-by: Dumitru Ceara --- controller/ovn-controller.c | 12 +++++++----- tests/ovn.at | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index ad33d17..9df598f 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -2079,12 +2079,14 @@ main(int argc, char *argv[]) unixctl_command_reply_error(pending_pkt.conn, error); free(error); } else { - VLOG_DBG("Pending_pkt conn but br_int %p or chassis " - "%p not ready. run-id: %"PRIu64, br_int, - chassis, engine_run_id); - unixctl_command_reply_error(pending_pkt.conn, - "ovn-controller not ready."); + unixctl_command_reply(pending_pkt.conn, NULL); } + } else { + VLOG_DBG("Pending_pkt conn but br_int %p or chassis " + "%p not ready. run-id: %"PRIu64, br_int, + chassis, engine_run_id); + unixctl_command_reply_error(pending_pkt.conn, + "ovn-controller not ready."); } pending_pkt.conn = NULL; free(pending_pkt.flow_s); diff --git a/tests/ovn.at b/tests/ovn.at index e88cffa..b85e549 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3723,7 +3723,7 @@ sleep 1 packet="inport==\"ls1-lp1\" && eth.src==$ls1_lp1_mac && eth.dst==$rp_ls1_mac && ip4 && ip.ttl==64 && ip4.src==$ls1_lp1_ip && ip4.dst==$ls2_lp1_ip && udp && udp.src==53 && udp.dst==4369" -as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet" +AT_CHECK([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) echo "---------NB dump-----"