Hi Xinyu, The commits are already there: [1] is 3ad8dd6 RATIS-2283. GrpcLogAppender Thread Restart Leaves catchup=false, Blocking Reconfiguration Progress (#1250) [2] is ba25d29 RATIS-2278. Follower Fails to Append Entries Due to Index Validation Race Condition in NavigableIndices (#1248) [3] 915d0c9 RATIS-2285. Bump ratis-thirdparty to 1.0.9 (#1252)
We do have missed the recent commits - 0557974 RATIS-2251. Migrate ratis-test tests to Junit 5 - Part 3. (#1227) - 8634542 RATIS-2294. Fix NettyClientRpc exception and timeout handling (#1264) - 2eda35d RATIS-2293. Fix typo in ClientProtoUtils (#1263) - 65fd444 RATIS-1995. Prevent data loss when a storage is accidentally re-formatted. (#1261) Let me merge them tomorrow. Tsz-Wo On Tue, May 20, 2025 at 6:21 PM Xinyu Tan <[email protected]> wrote: > Hi, Tsz-Wo > > It seems that master-tmp2 still lack of some commits such as [1][2][3]. > Maybe we need to double check commits if we are going to release 3.2.0 > soon! > > [1] https://github.com/apache/ratis/pull/1250 > [2] https://github.com/apache/ratis/pull/1247 > [3] https://github.com/apache/ratis/pull/1252 > > > > Tsz-Wo Nicholas Sze <[email protected]> 于2025年5月21日周三 04:28写道： > > > Found out the cherry-pick error -- I resolved a conflict incorrectly. > > Now, the master-tmp branch can pass everything [5]. The attachment > > contains the commits after RATIS-2269. > > > > Tsz-Wo > > > > [5] https://github.com/szetszwo/ratis/actions/runs/15143832246 > > > > On Mon, May 19, 2025 at 1:41 PM Tsz-Wo Nicholas Sze <[email protected]> > > wrote: > > > >> Hi Xinyu, > >> > >> > ... It contains all commits after 3.1.3 and up to RATIS-2269. You can > >> continue to merge new commits. > >> > >> I am merging the commits after RATIS-2269 to master-tmp. However, it is > >> getting CI failures > >> - checkstyle: there were some unused imports which were easy to fx. > >> - test failures after cherry-picked RATIS-2278; see [3, 4]. > >> > >> I am looking at the test failures. > >> > >> Tsz-Wo > >> [3] https://github.com/szetszwo/ratis/actions/runs/15121756786 > >> [4] https://github.com/szetszwo/ratis/tree/refs/heads/master-tmp2 > >> > > >
