diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index eb533eb..9c8f911 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -91065,7 +91065,7 @@ index 18c83fe9c2..dd14d81091 100644 struct hmap servers; struct ovsdb_error *error = diff --git a/ovsdb/raft.c b/ovsdb/raft.c -index 4789bc4f22..b09889d40b 100644 +index 4789bc4f22..1ef22d961a 100644 --- a/ovsdb/raft.c +++ b/ovsdb/raft.c @@ -36,6 +36,7 @@ @@ -91548,6 +91548,15 @@ index 4789bc4f22..b09889d40b 100644 } static void +@@ -3803,7 +3952,7 @@ 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++) { @@ -3913,7 +4062,7 @@ raft_handle_install_snapshot_request__( struct ovsdb_error *error = raft_save_snapshot(raft, new_log_start, &new_snapshot); diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 7b76416..f08d3e1 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 197%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 198%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -715,6 +715,12 @@ exit 0 %endif %changelog +* Wed Aug 31 2022 Open vSwitch CI - 2.13.0-198 +- Merging upstream branch-2.13 [RH git: 2f5d2b0cc8] + Commit list: + dcaa00483d raft: Fix unnecessary periodic compactions. + + * Fri Aug 12 2022 Open vSwitch CI - 2.13.0-197 - Merging upstream branch-2.13 [RH git: 8daa2a434e] Commit list: