]> git.proxmox.com Git - ovs.git/commitdiff
raft: Report jsonrpc backlog in kilobytes.
authorIlya Maximets <i.maximets@ovn.org>
Tue, 20 Oct 2020 11:00:20 +0000 (13:00 +0200)
committerIlya Maximets <i.maximets@ovn.org>
Sun, 25 Oct 2020 22:57:57 +0000 (23:57 +0100)
While sending snapshots backlog on raft connections could quickly
grow over 4GB and this will overflow raft-backlog counter.

Let's report it in kB instead. (Using kB and not KB to match with
ru_maxrss counter reported by kernel)

Fixes: 3423cd97f88f ("ovsdb: Add raft memory usage to memory report.")
Acked-by: Dumitru Ceara <dceara@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
ovsdb/raft.c

index 708b0624cf6535b5e6beca36f85839a58263f97f..3411323aa0d18860f210704de8195276b6a1e064 100644 (file)
@@ -1020,13 +1020,14 @@ void
 raft_get_memory_usage(const struct raft *raft, struct simap *usage)
 {
     struct raft_conn *conn;
+    uint64_t backlog = 0;
     int cnt = 0;
 
     LIST_FOR_EACH (conn, list_node, &raft->conns) {
-        simap_increase(usage, "raft-backlog",
-                       jsonrpc_session_get_backlog(conn->js));
+        backlog += jsonrpc_session_get_backlog(conn->js);
         cnt++;
     }
+    simap_increase(usage, "raft-backlog-kB", backlog / 1000);
     simap_increase(usage, "raft-connections", cnt);
 }