diff mbox series

[ovs-dev] ovsdb-tool: Add a db consistency check to the ovsdb-tool check-cluster command

Message ID CAAFK5zy0Jj_Om5R+itz_19xU7qMwcX4XrtvAgrOw81zvRP1F2A@mail.gmail.com
State Superseded
Headers show
Series [ovs-dev] ovsdb-tool: Add a db consistency check to the ovsdb-tool check-cluster command | expand

Commit Message

Federico Paolinelli July 9, 2020, 2:08 p.m. UTC 
There are some occurrences where the database ends up in an inconsistent
state. This happened in ovn-k8s and is described in
https://bugzilla.redhat.com/show_bug.cgi?id=1837953#c23.
Here we are adding a supported way to check that a given db is consistent,
which is less error prone than checking the logs.

This was only tested against a valid database, as did not manage to get a
corrupted one.

Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Suggested-by: Dumitru Ceara <dceara@redhat.com>
---
ovsdb/ovsdb-tool.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff mbox series

Patch

diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c
index 91662cab8..d5ada0c2d 100644
--- a/ovsdb/ovsdb-tool.c
+++ b/ovsdb/ovsdb-tool.c
@@ -1497,6 +1497,27 @@  do_check_cluster(struct ovs_cmdl_context *ctx)
}
}
+ /* Check for db consistency:
+ * The serverid must be in the servers list
+ */
+
+ for (struct server *s = c.servers; s < &c.servers[c.n_servers]; s++) {
+ struct shash *servers_obj = json_object(s->snap->servers);
+ char *server_id = xasprintf(SID_FMT, SID_ARGS(&s->header.sid));
+ bool found = false;
+ const struct shash_node *node;
+ SHASH_FOR_EACH (node, servers_obj) {
+ if (!strncmp(server_id, node->name, SID_LEN)) {
+ found = true;
+ }
+ }
+ if (!found) {
+ ovs_fatal(0, "%s: server %s not found in server list",
+ s->filename, server_id);
+ }
+ free(server_id);
+ }
+
/* Clean up. */
for (size_t i = 0; i < c.n_servers; i++) {
-- 
2.26.2