From patchwork Thu Aug 22 21:08:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1151821 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SZ2n5HFt"; dkim-atps=neutral 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 46Dxw5602sz9sMr for ; Fri, 23 Aug 2019 07:08:37 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id ABA7FE4E; Thu, 22 Aug 2019 21:08:32 +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 9E753D95 for ; Thu, 22 Aug 2019 21:08:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5128689B for ; Thu, 22 Aug 2019 21:08:30 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id t14so4151541plr.11 for ; Thu, 22 Aug 2019 14:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=526qIpjBKtlt61TeAj9VVUten7p8wm7byhQx1kwS3cE=; b=SZ2n5HFt16zRUXDAy7nPmiETT/0aQgmxKe8153Hv8U3285H3SKhy7PPJJAJ01U3q20 OsNWQ0rDfN/F3LKb8n1YDIpRz76esG929Ho8UBbfyWEIlycKimG00QbvCledyXaqSLaE 9oD6d9D7UHddw32aVDYPiGsNkaJVbKvsoKsvqhOtiZH5+pRKibqa3JT0WUiotU+Rk3TN VJJbroKhJ0bP7YGWCwYTk34+IEzmHPWagu85CIwBXd9e2Zw8bE/sUCT6rDbcer0adDgt iSMPuyJMhkFsDDs1GBP0P0c0v63xe/jNpq5JXZTskN2/CBNQohEf3deLUYMMyvhmp8Vz ER9w== 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; bh=526qIpjBKtlt61TeAj9VVUten7p8wm7byhQx1kwS3cE=; b=s4dZ001Osabo0OuuzHLGgutV6wfSW4Fxt53juNmLJ6Y26qfHlClVo+aCtqHdQfB+f0 nCGG2yIaLyHOQaJ2ZkXirRUWUaYZQikd1E7o+9x4XfmM2C/RsY07YvSiN01DG2mMw+/V MFlLFrRdV2mCS/vJR2ICgxRAM8foauljo6J4SnwuhRxKm7HVW7AETa4iQLv4AX9lM0pB 0xVHWPdZs3XNi3giVE0xfQkAzyF60+J4eVKQzjoIGJi76HMdREI2kxEjvrgF7d9NNsWe 3Hj16eHOtpAAjkBFiAmY7fg9kP72G2+Y3u15XKZsxWgR02/nAES8IqP7IhtFa/o00Z5i OIRQ== X-Gm-Message-State: APjAAAX/oNzB9yKUulc+hwMeyqn9TN9KLS4xxWGC7h95Ye5aMNypGd2/ Y4lcugyLtPLdvCcDgMUSa3a2IzQXgZ4= X-Google-Smtp-Source: APXvYqzFWETIjUekSdoz9vqYdgzfy6P60p5ccirr2Zo38siC5Lw9X5IrIB9GzolrdHhas/sSnuZXDA== X-Received: by 2002:a17:902:26f:: with SMTP id 102mr869101plc.189.1566508109511; Thu, 22 Aug 2019 14:08:29 -0700 (PDT) Received: from localhost.localdomain.localdomain ([73.241.94.255]) by smtp.gmail.com with ESMTPSA id w2sm190808pgc.32.2019.08.22.14.08.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Aug 2019 14:08:29 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Thu, 22 Aug 2019 14:08:21 -0700 Message-Id: <1566508103-22962-1-git-send-email-hzhou8@ebay.com> X-Mailer: git-send-email 2.1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 1/3] raft.c: Election timer initial reset with value from log. 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 From: Han Zhou After election timer is changed through cluster/change-election-timer command, if a server restarts, it firstly initializes with the default value and use it to reset the timer. Although it reads the latest timer value later from the log, the first timeout may be much shorter than expected by other servers that use latest timeout, and it would start election before it receives the first heartbeat from the leader. This patch fixes it by changing the order of reading log and resetting timer so that the latest value is read from the log before the initial resetting of the timer. Fixes: commit 8e35461 ("ovsdb raft: Support leader election time change online.") Signed-off-by: Han Zhou --- ovsdb/raft.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ovsdb/raft.c b/ovsdb/raft.c index 796790e..9eabe2c 100644 --- a/ovsdb/raft.c +++ b/ovsdb/raft.c @@ -404,8 +404,6 @@ raft_alloc(void) hmap_init(&raft->commands); raft->election_timer = ELECTION_BASE_MSEC; - raft_reset_ping_timer(raft); - raft_reset_election_timer(raft); return raft; } @@ -970,6 +968,9 @@ raft_open(struct ovsdb_log *log, struct raft **raftp) raft->join_timeout = time_msec() + 1000; } + raft_reset_ping_timer(raft); + raft_reset_election_timer(raft); + *raftp = raft; hmap_insert(&all_rafts, &raft->hmap_node, hash_string(raft->name, 0)); return NULL; From patchwork Thu Aug 22 21:08:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1151822 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RTGXzTiQ"; dkim-atps=neutral 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 46Dxwj1s6Wz9s3Z for ; Fri, 23 Aug 2019 07:09:09 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 607E0E54; Thu, 22 Aug 2019 21:08:34 +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 A3F63E43 for ; Thu, 22 Aug 2019 21:08:31 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 486F489B for ; Thu, 22 Aug 2019 21:08:31 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id 4so4155197pld.10 for ; Thu, 22 Aug 2019 14:08:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ghnyZNOMZxKr5HiL7Wo384C+6CifyXRSebmQgISC9sE=; b=RTGXzTiQ9QfoUrwoecvMgzYriWLOc3uuYtogujDwC8XNCcBYsbORmSB355DEe/76GT mlHKF1HdWiumfepkAr5fQ9BygDtMrY2yZNYTSlQKru136i0ReLCRokofNE1fYdIC2Qkw qjFpQ1cYjBMt6amMCJ7VQ0sz3zKGnNhlhWPPg1+qpXKMIHNPgXPFdcRIfhAgdiWyhzAT I0Hw3wu9yOWSJDw8cTAh4q4GeQyGmDq9eaphrm7880g7WDZjI1eriF71yqMMnV2THq7m frPPqSm2xbrQUyk23ucf5oSMCrUPo4vC7WBH54mLi7g90IaYyjU8OJJCaTA9lO4ho/a/ HWlQ== 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=ghnyZNOMZxKr5HiL7Wo384C+6CifyXRSebmQgISC9sE=; b=DnuYxVPdMJegZsM13gusHAsS6tNy/gwLE+KLhi9ESvaiK+kldStEqUp38SXNrS9G5E g9oWyA1zCjIFiOEIU+Aub+7JIeMnV6YFvrwxc4KH7Qs6aF97JRIIAcxQAnjH9bh2rCE/ fuvLENzQpl+45N/UDwvkt30FFW2j3TxteW2oCKq+EMtu/wx5V7IH5yrK98T28gGwU6Fl SQC6gUc9ETa6W3sviBZ6WD+r8iDEUyzWDpI0wuEW/mq0wDusbPkAcLqbtmJ4Eas7G7WL TfH0l7+HvW3LtteIPBEiyyjg/PQ+USqVUqMAaYhEPEj2FAG5cVR4B5VzF6OwMDAFsgiE j1dw== X-Gm-Message-State: APjAAAWyx1ZfJzutPvW8TycGtCZjkeQszy4eBfbcHyzDj3E9TuU5Enw/ G5T3qUtrJxaWiJckr3LXRJ7UfNzQl/4= X-Google-Smtp-Source: APXvYqyFkVTxoQUno/w5OhiwAOlyMYCD+Kvh3QR+PQ9MxQIfp1FpPfg84ClW19erdHbdY85hMOxI4g== X-Received: by 2002:a17:902:33a5:: with SMTP id b34mr857519plc.286.1566508110678; Thu, 22 Aug 2019 14:08:30 -0700 (PDT) Received: from localhost.localdomain.localdomain ([73.241.94.255]) by smtp.gmail.com with ESMTPSA id w2sm190808pgc.32.2019.08.22.14.08.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Aug 2019 14:08:29 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Thu, 22 Aug 2019 14:08:22 -0700 Message-Id: <1566508103-22962-2-git-send-email-hzhou8@ebay.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1566508103-22962-1-git-send-email-hzhou8@ebay.com> References: <1566508103-22962-1-git-send-email-hzhou8@ebay.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 2/3] raft: Save and read new election timer in header snapshot. 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 From: Han Zhou This patch store the latest election timer in snapshot during log compression, and when server restarts it reads the value from the log. Without this, any previous changes to election timer will be lost in the log, and if server restarts, it will use the default value instead of the changed value. Fixes: commit 8e35461 ("ovsdb raft: Support leader election time change online.") Signed-off-by: Han Zhou --- Documentation/ref/ovsdb.5.rst | 6 +++++- ovsdb/raft-private.c | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Documentation/ref/ovsdb.5.rst b/Documentation/ref/ovsdb.5.rst index a6da65d..bb35eee 100644 --- a/Documentation/ref/ovsdb.5.rst +++ b/Documentation/ref/ovsdb.5.rst @@ -164,7 +164,7 @@ The clustered format has the following additional notation: This allows readers to be ignorant of the full semantics of schema change. The first record in a clustered database contains the following members, -all of which are required: +all of which are required, except ``prev_election_timer``: ``"server_id": `` The server's own UUID, which must be unique within the cluster. @@ -190,6 +190,10 @@ all of which are required: term "prev_term". It might not include this server, if it was not the initial server in the cluster. +``"prev_election_timer": `` + The election base time before the beginning of the log. If not exist, + the default value 1000 ms is used as if it exists this record. + ``"prev_data": `` and ``"prev_eid": `` A snapshot of the data in the database at index "prev_index" and term "prev_term", and the entry ID for that data. The snapshot must contain a diff --git a/ovsdb/raft-private.c b/ovsdb/raft-private.c index 98c68a9..26d39a0 100644 --- a/ovsdb/raft-private.c +++ b/ovsdb/raft-private.c @@ -284,6 +284,7 @@ raft_entry_clone(struct raft_entry *dst, const struct raft_entry *src) dst->data = json_nullable_clone(src->data); dst->eid = src->eid; dst->servers = json_nullable_clone(src->servers); + dst->election_timer = src->election_timer; } void @@ -405,6 +406,8 @@ raft_header_from_json__(struct raft_header *h, struct ovsdb_parser *p) ovsdb_parser_member(p, "prev_data", OP_ANY)); h->snap.eid = raft_parse_required_uuid(p, "prev_eid"); h->snap.term = raft_parse_required_uint64(p, "prev_term"); + h->snap.election_timer = raft_parse_optional_uint64( + p, "prev_election_timer"); } } @@ -457,6 +460,10 @@ raft_header_to_json(const struct raft_header *h) } json_object_put_format(json, "prev_eid", UUID_FMT, UUID_ARGS(&h->snap.eid)); + if (h->snap.election_timer) { + raft_put_uint64(json, "prev_election_timer", + h->snap.election_timer); + } } return json; From patchwork Thu Aug 22 21:08:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1151823 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ibE8JGO4"; dkim-atps=neutral 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 46DxxT2GQ2z9sDQ for ; Fri, 23 Aug 2019 07:09:49 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 03F94E46; Thu, 22 Aug 2019 21:08:35 +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 9D90CE43 for ; Thu, 22 Aug 2019 21:08:32 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4ECA189B for ; Thu, 22 Aug 2019 21:08:32 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id d1so4396615pgp.4 for ; Thu, 22 Aug 2019 14:08:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UqDh3oHgzzJci9RdJbW8N++AEpCfiABXgimg2RSu1CE=; b=ibE8JGO4AtkK3TiQfsgi7MbEpfy6KHWo7qAwj778NhHwd8Br5xFbLOn+Wimv2Vy+5r sIxxLBgEb977NPlj8v+5jR4OtAeSEnvCvBhjra4oWeQZ96y72RuOsDC0bV+7PLHKUe+V CgLz/48dS5y7BcHDaRZRnWp5N201mw/q54riECXOtWS459XOS+x5i222sU1pioKGDIUZ mjM+yaHah4EiDkhUkJXCDV5FIy+UXi8he8AM1kL5TEmrgoHkjg6ZzVrACPgK2KHdiW8T SckVK5vIjd6x6qj71nTTPPtkv64O+7k1id+18DVfU+lCgzZP+6yEzebK+5JYUOg/Dqpl CqHg== 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=UqDh3oHgzzJci9RdJbW8N++AEpCfiABXgimg2RSu1CE=; b=eCFucP6c2FyFBG8Iv/5umrk8rP5BhD8upDNcrLzs4tJ9O3d8b+apH8nF4vbHGnYFlH S08e/Do7l65pnSrew/QJsrrsHakR00mzGp1InKlQkVgMmVeNj6x275rF4bJ03PXqv1lS GogUd3bGN4jwE0MT7iKCBIBV4yOrfAKePia+s6J7iUTz/HvU2vGlxXVWtH957r6M9vZG lmxRZYMghXaCYz/ko1LhXqlFMpJFFHJLx0diOODKHGvL74u3mIAOUuPbxvcZ+1B3emhZ VLWqiSy8hq2ACWAEDH/aU/vLoeDfrb2cp1aemRkSPTYN6QjbVTOz0JWPjHfYfOxQna2a l4DQ== X-Gm-Message-State: APjAAAVcKobUIVWYBbyjOj2ANX/MCv2/ogCuNwrZT8nmOZZpCqxA7d6T tvH6/+2d+pyTqS7lqlLFY8yEjQ7/wgI= X-Google-Smtp-Source: APXvYqy+POHiQMFVnuVyasYZLztUhZ6d3xgOzZHryOz18SeG1i2PRaD71y93KJMLB47M/yB2osC+zQ== X-Received: by 2002:a65:6406:: with SMTP id a6mr961374pgv.393.1566508111525; Thu, 22 Aug 2019 14:08:31 -0700 (PDT) Received: from localhost.localdomain.localdomain ([73.241.94.255]) by smtp.gmail.com with ESMTPSA id w2sm190808pgc.32.2019.08.22.14.08.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Aug 2019 14:08:31 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Thu, 22 Aug 2019 14:08:23 -0700 Message-Id: <1566508103-22962-3-git-send-email-hzhou8@ebay.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1566508103-22962-1-git-send-email-hzhou8@ebay.com> References: <1566508103-22962-1-git-send-email-hzhou8@ebay.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 3/3] ovsdb.5.rst: Fix minor format problem. 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 From: Han Zhou Signed-off-by: Han Zhou --- Documentation/ref/ovsdb.5.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/ref/ovsdb.5.rst b/Documentation/ref/ovsdb.5.rst index bb35eee..46d268c 100644 --- a/Documentation/ref/ovsdb.5.rst +++ b/Documentation/ref/ovsdb.5.rst @@ -156,7 +156,7 @@ The clustered format has the following additional notation: database. 2. The second element is either a transaction record in the format - described under ``Standalone Format'' above, or ``null``. + described under ``Standalone Format`` above, or ``null``. When a schema is present, the transaction record is relative to an empty database. That is, a schema change effectively resets the database to @@ -173,7 +173,7 @@ all of which are required, except ``prev_election_timer``: The address on which the server listens for connections from other servers in the cluster. -``name": `` +``"name": `` The database schema name. It is only important when a server is in the process of joining a cluster: a server will only join a cluster if the name matches. (If the database schema name were unique, then we would