| Message ID | 20201026014257.215501-2-i.maximets@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Mitigate RAFT memory consumption issues. | expand |
On 10/26/20 2:42 AM, Ilya Maximets wrote: > In many cases a big part of a memory consumed by ovsdb-server process > is a raft log, so it's important to add its length to the memory > report. > > Signed-off-by: Ilya Maximets <i.maximets@ovn.org> > --- > ovsdb/raft.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/ovsdb/raft.c b/ovsdb/raft.c > index 657eed813..ac85c6b67 100644 > --- a/ovsdb/raft.c > +++ b/ovsdb/raft.c > @@ -1029,6 +1029,7 @@ raft_get_memory_usage(const struct raft *raft, struct simap *usage) > } > simap_increase(usage, "raft-backlog-kB", backlog / 1000); > simap_increase(usage, "raft-connections", cnt); > + simap_increase(usage, "raft-log", raft->log_end - raft->log_start); > } > > /* Returns true if 'raft' has completed joining its cluster, has not left or > Looks good to me, thanks! Acked-by: Dumitru Ceara <dceara@redhat.com
On 10/28/20 11:56 AM, Dumitru Ceara wrote: > On 10/26/20 2:42 AM, Ilya Maximets wrote: >> In many cases a big part of a memory consumed by ovsdb-server process >> is a raft log, so it's important to add its length to the memory >> report. >> >> Signed-off-by: Ilya Maximets <i.maximets@ovn.org> >> --- >> ovsdb/raft.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/ovsdb/raft.c b/ovsdb/raft.c >> index 657eed813..ac85c6b67 100644 >> --- a/ovsdb/raft.c >> +++ b/ovsdb/raft.c >> @@ -1029,6 +1029,7 @@ raft_get_memory_usage(const struct raft *raft, struct simap *usage) >> } >> simap_increase(usage, "raft-backlog-kB", backlog / 1000); >> simap_increase(usage, "raft-connections", cnt); >> + simap_increase(usage, "raft-log", raft->log_end - raft->log_start); >> } >> >> /* Returns true if 'raft' has completed joining its cluster, has not left or >> > > Looks good to me, thanks! > > Acked-by: Dumitru Ceara <dceara@redhat.com > Thanks! Applied to master. Will backport down to 2.13 with dependencies as soon as TravisCI finishes the check. Best regards, Ilya Maximets.
diff --git a/ovsdb/raft.c b/ovsdb/raft.c index 657eed813..ac85c6b67 100644 --- a/ovsdb/raft.c +++ b/ovsdb/raft.c @@ -1029,6 +1029,7 @@ raft_get_memory_usage(const struct raft *raft, struct simap *usage) } simap_increase(usage, "raft-backlog-kB", backlog / 1000); simap_increase(usage, "raft-connections", cnt); + simap_increase(usage, "raft-log", raft->log_end - raft->log_start); } /* Returns true if 'raft' has completed joining its cluster, has not left or
In many cases a big part of a memory consumed by ovsdb-server process is a raft log, so it's important to add its length to the memory report. Signed-off-by: Ilya Maximets <i.maximets@ovn.org> --- ovsdb/raft.c | 1 + 1 file changed, 1 insertion(+)