Message ID | 20180719135126.19636-8-jkbs@redhat.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <ovs-dev-bounces@openvswitch.org> 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=<UNKNOWN>) 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 41WbB73c5qz9s7c for <incoming@patchwork.ozlabs.org>; Thu, 19 Jul 2018 23:55:11 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id F11C2F3E; Thu, 19 Jul 2018 13:51:44 +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 193C4F39 for <dev@openvswitch.org>; Thu, 19 Jul 2018 13:51:43 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A1FCB790 for <dev@openvswitch.org>; Thu, 19 Jul 2018 13:51:42 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id a19-v6so6485356wmb.2 for <dev@openvswitch.org>; Thu, 19 Jul 2018 06:51:42 -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=jMv9n1o2115LtklNNwJHowApqww8CqSRCRuH1Cutc3M=; b=o/LlrqwpyGudv+The+yGUzuhikNS2rUA1NjlL/TWJtlhMf/Sz9PQqLxpWgHPGkWyS2 7wGzFY6kbHxe0h2yqjvOgTQBYdhX/c/XddPE3vWJeoYpmANAC80PPuv4XEe3Xr9XpiLh qOnv6oNpv8l4G5DEoO4CKHAUAIbcX2gSvNPRoCh33bEYC04Yk3itJ9XlcEFW9oKPSFwA BzMPY8mGb77F9xBNNFwx3ISDRu7GiiHPEqGcmSmeEwvBQK5y+Ar9CMd8kmvcE/UpFiTi aVpXtQuW0ia5JWxsmPlEH5dZpN54P4sg8UucLyVH0v8TCURrBv3SRXfySDGv16SvDYl/ mgUQ== X-Gm-Message-State: AOUpUlEIr1MZZEELRGcFjPy2AzgYP9cvSJNaP2klEka9iuqWqoScagiM PdeXaKd1HNfUw0ds+EKcyyOE8IJkPbs= X-Google-Smtp-Source: AAOMgpfYIk2PkQf4W82stgkEtotoFWZmGNC/IBRSu9ADq7f407KuyRjQNTcxQxolmuu/7+Yqwhbfjw== X-Received: by 2002:a1c:93d2:: with SMTP id v201-v6mr4210403wmd.77.1532008301111; Thu, 19 Jul 2018 06:51:41 -0700 (PDT) Received: from redhat.com (218.red-2-136-166.dynamicip.rima-tde.net. [2.136.166.218]) by smtp.gmail.com with ESMTPSA id f18-v6sm7092889wrt.64.2018.07.19.06.51.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jul 2018 06:51:40 -0700 (PDT) From: Jakub Sitnicki <jkbs@redhat.com> To: dev@openvswitch.org Date: Thu, 19 Jul 2018 15:51:12 +0200 Message-Id: <20180719135126.19636-8-jkbs@redhat.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180719135126.19636-1-jkbs@redhat.com> References: <20180719135126.19636-1-jkbs@redhat.com> 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 v5 07/21] ovn-nbctl: Don't destroy the transaction twice on error. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: <ovs-dev.openvswitch.org> List-Unsubscribe: <https://mail.openvswitch.org/mailman/options/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe> List-Archive: <http://mail.openvswitch.org/pipermail/ovs-dev/> List-Post: <mailto:ovs-dev@openvswitch.org> List-Help: <mailto:ovs-dev-request@openvswitch.org?subject=help> List-Subscribe: <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org |
Series |
Daemon mode for ovn-nbctl
|
expand
|
diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index 360b25a89..25194b2fa 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -4307,6 +4307,7 @@ do_nbctl(const char *args, struct ctl_command *commands, size_t n_commands, } ovsdb_idl_txn_destroy(txn); + the_idl_txn = NULL; *retry = false; return;
Reset the global state, if transaction succeeded. Otherwise nbctl_exit() callback will try to clean up on any fatal error. Signed-off-by: Jakub Sitnicki <jkbs@redhat.com> --- ovn/utilities/ovn-nbctl.c | 1 + 1 file changed, 1 insertion(+) -- 2.14.4