From: Ken Ajiro <ajiro@mxw.nes.nec.co.jp>
Date: Tue, 28 Jan 2014 01:20:43 +0000 (+0000)
Subject: ovs-vsctl: Update will be discarded when multiple ovs-vsctl are executed
X-Git-Tag: sliver-openvswitch-2.1.90-1~8^2~12
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=66dbf9253ea690fa3fd19536ce063310c8fc94f7

ovs-vsctl: Update will be discarded when multiple ovs-vsctl are executed

When two ovs-vsctl update map type column at same time, one ovs-vsctl's
update will be discarded although all ovs-vsctl succeeded. This patch
fixes this issue.

Signed-off-by: Ken Ajiro <ajiro@mxw.nes.nec.co.jp>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index 528b40c67..af6ae5f2e 100644
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -3352,6 +3352,7 @@ set_column(const struct vsctl_table_class *table,
 
         ovsdb_datum_union(&datum, ovsdb_idl_read(row, column),
                           &column->type, false);
+        ovsdb_idl_txn_verify(row, column);
         ovsdb_idl_txn_write(row, column, &datum);
     } else {
         struct ovsdb_datum datum;