diff options
| author | Ben Pfaff <blp@ovn.org> | 2016-05-06 08:34:30 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2016-05-06 08:34:30 -0700 |
| commit | 22dcdea4f090f66d2e41fa16c633dfb296be52d3 (patch) | |
| tree | 1d256af64015a6086e94e69a456b375a9d678a44 | |
| parent | 2b3e861ef0fb5799825b0dcd40ff050174db4340 (diff) | |
| download | openvswitch-22dcdea4f090f66d2e41fa16c633dfb296be52d3.tar.gz | |
2-node testing in non-failure cases seems to work OK.
Easy failure case though:
Start two nodes.
Stop one.
Submit a log entry.
Restart node.
| -rw-r--r-- | ovsdb/raft.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ovsdb/raft.c b/ovsdb/raft.c index 72576300b..6762f7bad 100644 --- a/ovsdb/raft.c +++ b/ovsdb/raft.c @@ -1087,9 +1087,7 @@ parse_log_record(struct raft *raft, const struct json *entry) /* Parse "servers". */ const struct json *servers_json = ovsdb_parser_member(&p, "servers", OP_OBJECT | OP_OPTIONAL); - VLOG_INFO("%s:%d", __FILE__, __LINE__); if (servers_json) { - VLOG_INFO("%s:%d", __FILE__, __LINE__); struct hmap servers; struct ovsdb_error *error = raft_servers_from_json(servers_json, &servers); @@ -1188,7 +1186,6 @@ raft_read(struct raft *raft) break; } - VLOG_INFO("parsing log record"); error = parse_log_record(raft, entry); if (error) { return error; @@ -1443,6 +1440,8 @@ raft_receive_rpc(struct raft *raft, struct jsonrpc_session *js, if (!msg) { return false; } + putchar('.'); + fflush(stdout); struct ovsdb_error *error = raft_rpc_from_jsonrpc(raft, msg, rpc); if (error) { @@ -2545,7 +2544,6 @@ raft_handle_append_request__(struct raft *raft, uint64_t first_entry_index = rq->prev_log_index + 1; uint64_t nth_entry_index = rq->prev_log_index + rq->n_entries; if (OVS_LIKELY(first_entry_index >= raft->log_start)) { - VLOG_INFO("%s:%d", __FILE__, __LINE__); return raft_handle_append_entries(raft, rq, rq->prev_log_index, rq->prev_log_term, @@ -2578,7 +2576,6 @@ raft_handle_append_request__(struct raft *raft, * log_start log_end */ if (nth_entry_index < raft->log_start - 1) { - VLOG_INFO("%s:%d", __FILE__, __LINE__); return true; } @@ -2619,7 +2616,6 @@ raft_handle_append_request__(struct raft *raft, * log_start log_end */ if (nth_entry_index == raft->log_start - 1) { - VLOG_INFO("%s:%d", __FILE__, __LINE__); return (rq->n_entries ? raft->prev_term == rq->entries[rq->n_entries - 1].term : raft->prev_term == rq->prev_log_term); @@ -2665,7 +2661,6 @@ raft_handle_append_request__(struct raft *raft, * | | * log_start log_end */ - VLOG_INFO("%s:%d", __FILE__, __LINE__); uint64_t ofs = raft->log_start - first_entry_index; return raft_handle_append_entries( raft, rq, |