[ovs-dev] [PATCH 6/7] raft.c: cmd->eid should always be non-null.

Han Zhou zhouhan at gmail.com
Wed Apr 10 01:21:21 UTC 2019


From: Han Zhou <hzhou8 at ebay.com>

raft_command's eid should always be non-null in all 3 cases. Fix the
comment, and also replace if condition with assert.

Signed-off-by: Han Zhou <hzhou8 at ebay.com>
---
 ovsdb/raft.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ovsdb/raft.c b/ovsdb/raft.c
index abcc9c0..32dcea6 100644
--- a/ovsdb/raft.c
+++ b/ovsdb/raft.c
@@ -112,7 +112,7 @@ struct raft_command {
     /* Case 1 only. */
     uint64_t index;             /* Index in log (0 if being relayed). */
 
-    /* Cases 2 and 3. */
+    /* Cases 1, 2 and 3. */
     struct uuid eid;            /* Entry ID of result. */
 
     /* Case 2 only. */
@@ -1974,9 +1974,8 @@ raft_command_initiate(struct raft *raft,
     }
 
     struct raft_command *cmd = raft_command_create_incomplete(raft, index);
-    if (eid) {
-        cmd->eid = *eid;
-    }
+    ovs_assert(eid);
+    cmd->eid = *eid;
 
     raft_waiter_create(raft, RAFT_W_ENTRY, true)->entry.index = cmd->index;
 
-- 
2.1.0



More information about the dev mailing list