diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch index c96bcfb..0fc276b 100644 --- a/SOURCES/openvswitch-2.16.0.patch +++ b/SOURCES/openvswitch-2.16.0.patch @@ -8046,7 +8046,7 @@ index a69e37e5c2..48c6df511f 100644 /* On disk data serialization and deserialization. */ diff --git a/ovsdb/raft.c b/ovsdb/raft.c -index 2fb5156519..b70fbed5d4 100644 +index 2fb5156519..863a628eae 100644 --- a/ovsdb/raft.c +++ b/ovsdb/raft.c @@ -74,9 +74,12 @@ enum raft_failure_test { @@ -8488,7 +8488,13 @@ index 2fb5156519..b70fbed5d4 100644 struct raft_header h = { .sid = raft->sid, .cid = raft->cid, -@@ -3998,12 +4041,13 @@ raft_write_snapshot(struct raft *raft, struct ovsdb_log *log, +@@ -3993,17 +4036,18 @@ raft_write_snapshot(struct raft *raft, struct ovsdb_log *log, + if (error) { + return error; + } +- ovsdb_log_mark_base(raft->log); ++ ovsdb_log_mark_base(log); + /* Write log records. */ for (uint64_t index = new_log_start; index < raft->log_end; index++) { const struct raft_entry *e = &raft->entries[index - raft->log_start]; diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec index 1caa38a..fd2bf0a 100644 --- a/SPECS/openvswitch2.16.spec +++ b/SPECS/openvswitch2.16.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.16.0 -Release: 96%{?dist} +Release: 97%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,12 @@ exit 0 %endif %changelog +* Wed Aug 31 2022 Open vSwitch CI - 2.16.0-97 +- Merging upstream branch-2.16 [RH git: e6de3f5eee] + Commit list: + 975bd48a00 raft: Fix unnecessary periodic compactions. + + * Mon Aug 15 2022 Open vSwitch CI - 2.16.0-96 - Merging upstream branch-2.16 [RH git: ddb62f8750] Commit list: