From patchwork Tue Jul 31 13:22:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 951593 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=redhat.com 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 41fxvJ4s0hz9rvt for ; Tue, 31 Jul 2018 23:22:51 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1C715C7F; Tue, 31 Jul 2018 13:22:49 +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 A217E516 for ; Tue, 31 Jul 2018 13:22:47 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id DADA6782 for ; Tue, 31 Jul 2018 13:22:46 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id c14-v6so3053725wmb.4 for ; Tue, 31 Jul 2018 06:22:46 -0700 (PDT) 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:in-reply-to :references; bh=TKoDfbnEY2P9KnbP5b4afRCQfj3KPcUhz8Ht6Y8Ds6M=; b=pMCxMRaQZtZxuwaqeOZptD6pLRSwlglnyJ8oAkwpg5/ce1cv79K3QT71/tgn+2Kdlv ZV+YkRPKoKFk0Sh25UzN1S6AYn+3EmdchEP3KT/0xG4VEiYIXJ4nvVWmZOB7Ogv2qUQO ZXGrcftkExph0QeFd9kO0tNenC8Y38x1nl7A2QMfZnbU7yfBUGUqBXdEBAZHQnAKWLfW rtjSc2wuk2uaoPYv2+VwNyfdVY3fQdxE0z85rbOonmPjbmMrJNDQ8rM1SoIXaadw/U+2 8P2yJiWomod5PEzYnwqsiEtCDJxFVRql41+9i/HNwG2qm1cwuX7orpWWMjlkRaJ6r5vX 4D4w== X-Gm-Message-State: AOUpUlEFO7oKYjrgvIJutr0WrYoSKr2SCV3fwaL7wYuE+UfoIrDvb4iQ Rkj/hEKazz/0lhmU34iNOLuZURSOIUQ= X-Google-Smtp-Source: AAOMgpdSUL/gzUftsODFhJnDfmqlt810OGIeTNS/21f3PY9oe2Bhqb7N9/7SNBpVrvKdnWDkNlvw1A== X-Received: by 2002:a1c:2b43:: with SMTP id r64-v6mr2123083wmr.96.1533043365209; Tue, 31 Jul 2018 06:22:45 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id d21-v6sm2945906wma.24.2018.07.31.06.22.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Jul 2018 06:22:44 -0700 (PDT) From: Lorenzo Bianconi To: dev@openvswitch.org Date: Tue, 31 Jul 2018 15:22:38 +0200 Message-Id: <41ebb20b5a2518cfcf8b7bbeb4e832433d38e0cb.1533042973.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, 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 v3] Introduce ovs-appctl command to monitor HVs sb connection status 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 Add 'connection-status' command to ovs-appctl utility in order to check if a given chassis is currently connected to SB db Acked-by: Mark Michelson Co-authored-by: aginwala Signed-off-by: aginwala Signed-off-by: Lorenzo Bianconi --- Changes since v2: - check idl->session pointer in ovsdb_idl_is_connected routine Changes since v1: - add unit tests for ovs-appctl -t ovn-controller connection-status command - use jsonrpc_session_is_connected() in ovsdb_idl_is_connected routine --- lib/ovsdb-idl.c | 6 +++++ lib/ovsdb-idl.h | 1 + ovn/controller/ovn-controller.8.xml | 5 +++++ ovn/controller/ovn-controller.c | 17 +++++++++++++++ tests/ovn-controller.at | 34 +++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+) diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c index ae0a55c3a..40c29cbd1 100644 --- a/lib/ovsdb-idl.c +++ b/lib/ovsdb-idl.c @@ -922,6 +922,12 @@ ovsdb_idl_is_alive(const struct ovsdb_idl *idl) idl->state != IDL_S_ERROR; } +bool +ovsdb_idl_is_connected(const struct ovsdb_idl *idl) +{ + return idl->session && jsonrpc_session_is_connected(idl->session); +} + /* Returns the last error reported on a connection by 'idl'. The return value * is 0 only if no connection made by 'idl' has ever encountered an error and * a negative response to a schema request has never been received. See diff --git a/lib/ovsdb-idl.h b/lib/ovsdb-idl.h index ea18b22f5..5f933b628 100644 --- a/lib/ovsdb-idl.h +++ b/lib/ovsdb-idl.h @@ -80,6 +80,7 @@ void ovsdb_idl_force_reconnect(struct ovsdb_idl *); void ovsdb_idl_verify_write_only(struct ovsdb_idl *); bool ovsdb_idl_is_alive(const struct ovsdb_idl *); +bool ovsdb_idl_is_connected(const struct ovsdb_idl *idl); int ovsdb_idl_get_last_error(const struct ovsdb_idl *); void ovsdb_idl_set_probe_interval(const struct ovsdb_idl *, int probe_interval); diff --git a/ovn/controller/ovn-controller.8.xml b/ovn/controller/ovn-controller.8.xml index 2e4e53d6b..8035638b3 100644 --- a/ovn/controller/ovn-controller.8.xml +++ b/ovn/controller/ovn-controller.8.xml @@ -398,6 +398,11 @@ 0x800.

+ +
connection-status
+
+ Show OVN SBDB connection status for the chassis. +

diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c index 470e02ae8..bc4e8014b 100644 --- a/ovn/controller/ovn-controller.c +++ b/ovn/controller/ovn-controller.c @@ -68,6 +68,7 @@ static unixctl_cb_func ct_zone_list; static unixctl_cb_func meter_table_list; static unixctl_cb_func group_table_list; static unixctl_cb_func inject_pkt; +static unixctl_cb_func ovn_controller_conn_show; #define DEFAULT_BRIDGE_NAME "br-int" #define DEFAULT_PROBE_INTERVAL_MSEC 5000 @@ -594,6 +595,9 @@ main(int argc, char *argv[]) ovsdb_idl_create(ovnsb_remote, &sbrec_idl_class, true, true)); ovsdb_idl_set_leader_only(ovnsb_idl_loop.idl, false); + unixctl_command_register("connection-status", "", 0, 0, + ovn_controller_conn_show, ovnsb_idl_loop.idl); + struct ovsdb_idl_index *sbrec_chassis_by_name = chassis_index_create(ovnsb_idl_loop.idl); struct ovsdb_idl_index *sbrec_multicast_group_by_name_datapath @@ -1122,3 +1126,16 @@ update_probe_interval(const struct ovsrec_open_vswitch_table *ovs_table, ovsdb_idl_set_probe_interval(ovnsb_idl, interval); } + +static void +ovn_controller_conn_show(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *idl_) +{ + char *result = "not connected"; + struct ovsdb_idl *idl = idl_; + + if (idl && ovsdb_idl_is_connected(idl)) { + result = "connected"; + } + unixctl_command_reply(conn, result); +} diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index ecc6a50da..13e88a0cc 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -228,3 +228,37 @@ as ovn-sb OVS_APP_EXIT_AND_WAIT([ovsdb-server]) AT_CLEANUP + +# Check ovn-controller connection status to Southbound database +AT_SETUP([ovn-controller - check sbdb connection]) +AT_KEYWORDS([ovn]) +ovn_init_db ovn-sb + +net_add n1 +sim_add hv +as hv +ovs-vsctl \ + -- add-br br-phys \ + -- add-br br-eth0 \ + -- add-br br-eth1 \ + -- add-br br-eth2 +ovn_attach n1 br-phys 192.168.0.1 + +check_sbdb_connection () { + test "$(ovs-appctl -t ovn-controller connection-status)" = "$1" +} + +OVS_WAIT_UNTIL([check_sbdb_connection connected]) + +ovs-vsctl set open . external_ids:ovn-remote=tcp:192.168.0.10:6642 +OVS_WAIT_UNTIL([check_sbdb_connection 'not connected']) + +# reset the remote for clean-up +ovs-vsctl set open . external_ids:ovn-remote=unix:$ovs_base/ovn-sb/ovn-sb.sock +# Gracefully terminate daemons +OVN_CLEANUP_SBOX([hv]) +OVN_CLEANUP_VSWITCH([main]) +as ovn-sb +OVS_APP_EXIT_AND_WAIT([ovsdb-server]) + +AT_CLEANUP