diff options
| author | Ilya Maximets <i.maximets@ovn.org> | 2023-01-03 17:22:36 +0100 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2023-01-18 13:55:16 +0100 |
| commit | 9e0986eebb8cc52940b1144b07a2ff5d5f5a2474 (patch) | |
| tree | bb97f6119fa5dfdc6779132b1800a8fef365b132 | |
| parent | 6884a231869c5425ddaec0319f376333389e63d2 (diff) | |
| download | openvswitch-9e0986eebb8cc52940b1144b07a2ff5d5f5a2474.tar.gz | |
ovsdb: Fix database statistics during the database replacement.
The counter for the number of atoms has to be re-set to the number from
the new database, otherwise the value will be incorrect. For example,
this is causing the atom counter doubling after online conversion of
a clustered database.
Miscounting may also lead to increased memory consumption by the
transaction history or otherwise too aggressive transaction history
sweep.
Fixes: 317b1bfd7dd3 ("ovsdb: Don't let transaction history grow larger than the database.")
Acked-by: Han Zhou <hzhou@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
| -rw-r--r-- | ovsdb/ovsdb.c | 3 | ||||
| -rw-r--r-- | tests/ovsdb-server.at | 18 |
2 files changed, 21 insertions, 0 deletions
diff --git a/ovsdb/ovsdb.c b/ovsdb/ovsdb.c index 1c011fab0..3f470369b 100644 --- a/ovsdb/ovsdb.c +++ b/ovsdb/ovsdb.c @@ -711,5 +711,8 @@ ovsdb_replace(struct ovsdb *dst, struct ovsdb *src) dst->rbac_role = ovsdb_get_table(dst, "RBAC_Role"); + /* Get statistics from the new database. */ + dst->n_atoms = src->n_atoms; + ovsdb_destroy(src); } diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 0828e6d04..bf539b6e5 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -1308,6 +1308,24 @@ dnl After removing all the bridges, the number of atoms in the database dnl should return to its initial value. AT_CHECK([test $(get_memory_value atoms) -eq $initial_db_atoms]) +dnl Add a few more resources. +for i in $(seq 1 10); do + cmd=$(add_ports $i $(($i / 4 + 1))) + AT_CHECK([ovs-vsctl --no-wait add-br br$i $cmd]) +done +check_atoms + +db_atoms_before_conversion=$(get_memory_value atoms) + +dnl Trigger online conversion. +AT_CHECK([ovsdb-client convert $abs_top_srcdir/vswitchd/vswitch.ovsschema], + [0], [ignore], [ignore]) + +dnl Check that conversion didn't change the number of atoms and the history +dnl still has a reasonable size. +check_atoms +AT_CHECK([test $(get_memory_value atoms) -eq $db_atoms_before_conversion]) + OVS_APP_EXIT_AND_WAIT([ovsdb-server]) AT_CLEANUP |