diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 66e44f5..f8ab248 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -26460,7 +26460,7 @@ index 26d39a087f..7b7bcd74ac 100644 } return NULL; diff --git a/ovsdb/raft.c b/ovsdb/raft.c -index ea91d1fdba..86d4e3e623 100644 +index ea91d1fdba..f08099683f 100644 --- a/ovsdb/raft.c +++ b/ovsdb/raft.c @@ -74,8 +74,11 @@ enum raft_failure_test { @@ -26764,6 +26764,15 @@ index ea91d1fdba..86d4e3e623 100644 /* Figure 3.1: "If there exists an N such that N > commitIndex, a * majority of matchIndex[i] >= N, and log[N].term == currentTerm, set * commitIndex = N (sections 3.5 and 3.6)." */ +@@ -3899,7 +3965,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++) { @@ -4038,6 +4104,10 @@ static void raft_handle_install_snapshot_request( struct raft *raft, const struct raft_install_snapshot_request *rq) diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 2d72cb3..2393c63 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 117%{?dist} +Release: 118%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,12 @@ exit 0 %endif %changelog +* Wed Aug 31 2022 Open vSwitch CI - 2.15.0-118 +- Merging upstream branch-2.15 [RH git: f73b3f1931] + Commit list: + 93e88f39e1 raft: Fix unnecessary periodic compactions. + + * Tue Aug 09 2022 Open vSwitch CI - 2.15.0-117 - Merging upstream branch-2.15 [RH git: 671f431f8e] Commit list: