{"id":815914,"url":"http://patchwork.ozlabs.org/api/patches/815914/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-28-blp@ovn.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/projects/47/?format=json","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-28-blp@ovn.org>","list_archive_url":null,"date":"2017-09-19T22:01:00","name":"[ovs-dev,RFC,27/52] jsonrpc-server: Separate changing read_only status from reconnecting.","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"ff5755450aeb131e303c729615ecf4ba7c7b2cfa","submitter":{"id":67603,"url":"http://patchwork.ozlabs.org/api/people/67603/?format=json","name":"Ben Pfaff","email":"blp@ovn.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-28-blp@ovn.org/mbox/","series":[{"id":3975,"url":"http://patchwork.ozlabs.org/api/series/3975/?format=json","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/815914/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815914/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","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 3xxd3Q45Hlz9sBW\n\tfor ;\n\tWed, 20 Sep 2017 08:34:42 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 88E2CDB5;\n\tTue, 19 Sep 2017 22:22:35 +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 3CFFCC7C\n\tfor ; Tue, 19 Sep 2017 22:22:34 +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 77A0020D\n\tfor ; Tue, 19 Sep 2017 22:22:33 +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 A9F5E534EBC\n\tfor ; Wed, 20 Sep 2017 00:02:15 +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 215DF17209F;\n\tWed, 20 Sep 2017 00:02:13 +0200 (CEST)"],"X-Greylist":"from auto-whitelisted by SQLgrey-1.7.6","X-Originating-IP":"208.91.2.3","From":"Ben Pfaff ","To":"dev@openvswitch.org","Date":"Tue, 19 Sep 2017 15:01:00 -0700","Message-Id":"<20170919220125.32535-28-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 ","Subject":"[ovs-dev] [PATCH RFC 27/52] jsonrpc-server: Separate changing\n\tread_only status from reconnecting.","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","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":"Changing whether a server's databases are read-only is logically\nindependent from whether its sessions need to reconnect, so use different\nfunctions for the purpose.\n\nSigned-off-by: Ben Pfaff \n---\n ovsdb/jsonrpc-server.c | 19 ++++++++++++++-----\n ovsdb/jsonrpc-server.h | 7 +++++--\n ovsdb/ovsdb-server.c | 15 +++------------\n 3 files changed, 22 insertions(+), 19 deletions(-)","diff":"diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c\nindex aec6603958d7..1bc1f06c4ce2 100644\n--- a/ovsdb/jsonrpc-server.c\n+++ b/ovsdb/jsonrpc-server.c\n@@ -165,7 +165,7 @@ ovsdb_jsonrpc_server_add_db(struct ovsdb_jsonrpc_server *svr, struct ovsdb *db)\n * If this is too big of a hammer in practice, we could be more selective,\n * e.g. disconnect only connections that actually tried to use a database\n * with 'db''s name. */\n- ovsdb_jsonrpc_server_reconnect(svr, svr->read_only);\n+ ovsdb_jsonrpc_server_reconnect(svr);\n \n return ovsdb_server_add_db(&svr->up, db);\n }\n@@ -182,7 +182,7 @@ ovsdb_jsonrpc_server_remove_db(struct ovsdb_jsonrpc_server *svr,\n *\n * If this is too big of a hammer in practice, we could be more selective,\n * e.g. disconnect only connections that actually reference 'db'. */\n- ovsdb_jsonrpc_server_reconnect(svr, svr->read_only);\n+ ovsdb_jsonrpc_server_reconnect(svr);\n \n return ovsdb_server_remove_db(&svr->up, db);\n }\n@@ -336,11 +336,10 @@ ovsdb_jsonrpc_server_free_remote_status(\n /* Forces all of the JSON-RPC sessions managed by 'svr' to disconnect and\n * reconnect. */\n void\n-ovsdb_jsonrpc_server_reconnect(struct ovsdb_jsonrpc_server *svr, bool read_only)\n+ovsdb_jsonrpc_server_reconnect(struct ovsdb_jsonrpc_server *svr)\n {\n struct shash_node *node;\n \n- svr->read_only = read_only;\n SHASH_FOR_EACH (node, &svr->remotes) {\n struct ovsdb_jsonrpc_remote *remote = node->data;\n \n@@ -349,12 +348,22 @@ ovsdb_jsonrpc_server_reconnect(struct ovsdb_jsonrpc_server *svr, bool read_only)\n }\n \n bool\n-ovsdb_jsonrpc_server_is_read_only(struct ovsdb_jsonrpc_server *svr)\n+ovsdb_jsonrpc_server_is_read_only(const struct ovsdb_jsonrpc_server *svr)\n {\n return svr->read_only;\n }\n \n void\n+ovsdb_jsonrpc_server_set_read_only(struct ovsdb_jsonrpc_server *svr,\n+ bool read_only)\n+{\n+ if (svr->read_only != read_only) {\n+ svr->read_only = read_only;\n+ ovsdb_jsonrpc_server_reconnect(svr);\n+ }\n+}\n+\n+void\n ovsdb_jsonrpc_server_run(struct ovsdb_jsonrpc_server *svr)\n {\n struct shash_node *node;\ndiff --git a/ovsdb/jsonrpc-server.h b/ovsdb/jsonrpc-server.h\nindex 1add3276d3b6..a3acc75f8d4f 100644\n--- a/ovsdb/jsonrpc-server.h\n+++ b/ovsdb/jsonrpc-server.h\n@@ -64,11 +64,14 @@ bool ovsdb_jsonrpc_server_get_remote_status(\n void ovsdb_jsonrpc_server_free_remote_status(\n struct ovsdb_jsonrpc_remote_status *);\n \n-void ovsdb_jsonrpc_server_reconnect(struct ovsdb_jsonrpc_server *, bool read_only);\n+void ovsdb_jsonrpc_server_reconnect(struct ovsdb_jsonrpc_server *);\n \n void ovsdb_jsonrpc_server_run(struct ovsdb_jsonrpc_server *);\n void ovsdb_jsonrpc_server_wait(struct ovsdb_jsonrpc_server *);\n-bool ovsdb_jsonrpc_server_is_read_only(struct ovsdb_jsonrpc_server *);\n+\n+bool ovsdb_jsonrpc_server_is_read_only(const struct ovsdb_jsonrpc_server *);\n+void ovsdb_jsonrpc_server_set_read_only(struct ovsdb_jsonrpc_server *,\n+ bool read_only);\n \n void ovsdb_jsonrpc_server_get_memory_usage(const struct ovsdb_jsonrpc_server *,\n struct simap *usage);\ndiff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c\nindex 8254fbb8733d..99ba6949f016 100644\n--- a/ovsdb/ovsdb-server.c\n+++ b/ovsdb/ovsdb-server.c\n@@ -156,7 +156,6 @@ main_loop(struct ovsdb_jsonrpc_server *jsonrpc, struct shash *all_dbs,\n char *remotes_error, *ssl_error;\n struct shash_node *node;\n long long int status_timer = LLONG_MIN;\n- bool last_role = *is_backup;\n \n *exiting = false;\n ssl_error = NULL;\n@@ -182,12 +181,7 @@ main_loop(struct ovsdb_jsonrpc_server *jsonrpc, struct shash *all_dbs,\n * the set of remotes that reconfigure_remotes() uses. */\n unixctl_server_run(unixctl);\n \n- /* In ovsdb-server's role (active or backup) has changed, restart\n- * the ovsdb jsonrpc server. */\n- if (last_role != *is_backup) {\n- bool read_only = last_role = *is_backup;\n- ovsdb_jsonrpc_server_reconnect(jsonrpc, read_only);\n- }\n+ ovsdb_jsonrpc_server_set_read_only(jsonrpc, *is_backup);\n \n report_error_if_changed(\n reconfigure_remotes(jsonrpc, all_dbs, remotes),\n@@ -1112,10 +1106,9 @@ ovsdb_server_disable_monitor_cond(struct unixctl_conn *conn,\n void *jsonrpc_)\n {\n struct ovsdb_jsonrpc_server *jsonrpc = jsonrpc_;\n- bool read_only = ovsdb_jsonrpc_server_is_read_only(jsonrpc);\n \n ovsdb_jsonrpc_disable_monitor_cond();\n- ovsdb_jsonrpc_server_reconnect(jsonrpc, read_only);\n+ ovsdb_jsonrpc_server_reconnect(jsonrpc);\n unixctl_command_reply(conn, NULL);\n }\n \n@@ -1172,9 +1165,7 @@ ovsdb_server_reconnect(struct unixctl_conn *conn, int argc OVS_UNUSED,\n const char *argv[] OVS_UNUSED, void *jsonrpc_)\n {\n struct ovsdb_jsonrpc_server *jsonrpc = jsonrpc_;\n- bool read_only = ovsdb_jsonrpc_server_is_read_only(jsonrpc);\n-\n- ovsdb_jsonrpc_server_reconnect(jsonrpc, read_only);\n+ ovsdb_jsonrpc_server_reconnect(jsonrpc);\n unixctl_command_reply(conn, NULL);\n }\n \n","prefixes":["ovs-dev","RFC","27/52"]}