Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/815908/?format=api
{ "id": 815908, "url": "http://patchwork.ozlabs.org/api/patches/815908/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-38-blp@ovn.org/", "project": { "id": 47, "url": "http://patchwork.ozlabs.org/api/projects/47/?format=api", "name": "Open vSwitch", "link_name": "openvswitch", "list_id": "ovs-dev.openvswitch.org", "list_email": "ovs-dev@openvswitch.org", "web_url": "http://openvswitch.org/", "scm_url": "git@github.com:openvswitch/ovs.git", "webscm_url": "https://github.com/openvswitch/ovs", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170919220125.32535-38-blp@ovn.org>", "list_archive_url": null, "date": "2017-09-19T22:01:10", "name": "[ovs-dev,RFC,37/52] ovsdb-idl: Verify insertion into singleton tables.", "commit_ref": null, "pull_url": null, "state": "rfc", "archived": false, "hash": "165fa679e74509145705e97e7342cc56b51d2332", "submitter": { "id": 67603, "url": "http://patchwork.ozlabs.org/api/people/67603/?format=api", "name": "Ben Pfaff", "email": "blp@ovn.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-38-blp@ovn.org/mbox/", "series": [ { "id": 3975, "url": "http://patchwork.ozlabs.org/api/series/3975/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/list/?series=3975", "date": "2017-09-19T22:00:34", "name": "clustering implementation", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/3975/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/815908/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815908/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<ovs-dev-bounces@openvswitch.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "dev@openvswitch.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "ovs-dev@mail.linuxfoundation.org" ], "Authentication-Results": "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxcyx6lsQz9sBW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Sep 2017 08:30:49 +1000 (AEST)", "from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 923E7D80;\n\tTue, 19 Sep 2017 22:21:05 +0000 (UTC)", "from smtp1.linuxfoundation.org (smtp1.linux-foundation.org\n\t[172.17.192.35])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 6FEE2D54\n\tfor <dev@openvswitch.org>; Tue, 19 Sep 2017 22:21:02 +0000 (UTC)", "from slow1-d.mail.gandi.net (slow1-d.mail.gandi.net\n\t[217.70.178.86])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTP id E3082174\n\tfor <dev@openvswitch.org>; Tue, 19 Sep 2017 22:21:01 +0000 (UTC)", "from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby slow1-d.mail.gandi.net (Postfix) with ESMTP id CA109534EEA\n\tfor <dev@openvswitch.org>; Wed, 20 Sep 2017 00:02:31 +0200 (CEST)", "from sigabrt.benpfaff.org (unknown [208.91.2.3])\n\t(Authenticated sender: blp@ovn.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 1F8B8172098;\n\tWed, 20 Sep 2017 00:02:29 +0200 (CEST)" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.7.6", "X-Originating-IP": "208.91.2.3", "From": "Ben Pfaff <blp@ovn.org>", "To": "dev@openvswitch.org", "Date": "Tue, 19 Sep 2017 15:01:10 -0700", "Message-Id": "<20170919220125.32535-38-blp@ovn.org>", "X-Mailer": "git-send-email 2.10.2", "In-Reply-To": "<20170919220125.32535-1-blp@ovn.org>", "References": "<20170919220125.32535-1-blp@ovn.org>", "X-Spam-Status": "No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW\n\tautolearn=disabled version=3.3.1", "X-Spam-Checker-Version": "SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org", "Cc": "Ben Pfaff <blp@ovn.org>", "Subject": "[ovs-dev] [PATCH RFC 37/52] ovsdb-idl: Verify insertion into\n\tsingleton tables.", "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>,\n\t<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>,\n\t<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" }, "content": "This makes ovs-vsctl and similar tools tolerate initialization races,\nwhere more than one client at a time tries to initialize a table like\nOpen_vSwitch or SB_Global.\n\nSigned-off-by: Ben Pfaff <blp@ovn.org>\n---\n lib/ovsdb-idl-provider.h | 1 +\n lib/ovsdb-idl.c | 24 ++++++++++++++++++++----\n ovsdb/ovsdb-idlc.in | 8 ++++++--\n 3 files changed, 27 insertions(+), 6 deletions(-)", "diff": "diff --git a/lib/ovsdb-idl-provider.h b/lib/ovsdb-idl-provider.h\nindex a3eccb4c0ce6..d826c63e242f 100644\n--- a/lib/ovsdb-idl-provider.h\n+++ b/lib/ovsdb-idl-provider.h\n@@ -97,6 +97,7 @@ struct ovsdb_idl_column {\n struct ovsdb_idl_table_class {\n char *name;\n bool is_root;\n+ bool is_singleton;\n const struct ovsdb_idl_column *columns;\n size_t n_columns;\n size_t allocation_size;\ndiff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c\nindex 85c74669024e..95aa611aa957 100644\n--- a/lib/ovsdb-idl.c\n+++ b/lib/ovsdb-idl.c\n@@ -3511,12 +3511,28 @@ ovsdb_idl_txn_commit(struct ovsdb_idl_txn *txn)\n }\n } else if (row->old_datum != row->new_datum) {\n struct json *row_json;\n- struct json *op;\n size_t idx;\n \n- op = json_object_create();\n- json_object_put_string(op, \"op\", row->old_datum ? \"update\"\n- : \"insert\");\n+ if (!row->old_datum && class->is_singleton) {\n+ /* We're inserting a row into a table that allows only a\n+ * single row. (This is a fairly common OVSDB pattern for\n+ * storing global data.) Verify that the table is empty\n+ * before inserting the row, so that we get a clear\n+ * verification-related failure if there was an insertion\n+ * race with another client. */\n+ struct json *op = json_object_create();\n+ json_array_add(operations, op);\n+ json_object_put_string(op, \"op\", \"wait\");\n+ json_object_put_string(op, \"table\", class->name);\n+ json_object_put(op, \"where\", json_array_create_empty());\n+ json_object_put(op, \"timeout\", json_integer_create(0));\n+ json_object_put_string(op, \"until\", \"==\");\n+ json_object_put(op, \"rows\", json_array_create_empty());\n+ }\n+\n+ struct json *op = json_object_create();\n+ json_object_put_string(op, \"op\",\n+ row->old_datum ? \"update\" : \"insert\");\n json_object_put_string(op, \"table\", class->name);\n if (row->old_datum) {\n json_object_put(op, \"where\", where_uuid_equals(&row->uuid));\ndiff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in\nindex 24e86b772fbe..279c610ffc88 100755\n--- a/ovsdb/ovsdb-idlc.in\n+++ b/ovsdb/ovsdb-idlc.in\n@@ -1289,9 +1289,13 @@ void\n is_root = \"true\"\n else:\n is_root = \"false\"\n- print(\" {\\\"%s\\\", %s,\" % (tableName, is_root))\n+ if table.max_rows == 1:\n+ is_singleton = \"true\"\n+ else:\n+ is_singleton = \"false\"\n+ print(\" {\\\"%s\\\", %s, %s,\" % (tableName, is_root, is_singleton))\n print(\" %s_columns, ARRAY_SIZE(%s_columns),\" % (\n- structName, structName))\n+ structName, structName))\n print(\" sizeof(struct %s), %s_init__},\" % (structName, structName))\n print(\"};\")\n \n", "prefixes": [ "ovs-dev", "RFC", "37/52" ] }