Hi dev, I have re-cherry-picked the commits from apache/master to master-tmp for fixing a missing commit (RATIS-2124) and also the commit messages. Now, master-tmp is 210 commits ahead of, 236 commits behind apache/master.
Below is a summary of the commit difference; see the attached apache-master_master-tmp.diff file for more details. 236 issues (apache/master) - 30 issues (zero-copy issues not in master-tmp [6]) + 1 issue (reverting RATIS-1983 zero-copy refactoring change) - 1 issue (for not merging RATIS-2129 Raftlog readlock) + 6 issues (for version/cherry-pick changes) - 2 issues (for RATIS-2278, committed and then reverted) = 210 issues (master-tmp) Note that - [8] is the last matching commit of master-tmp and apache/master - [9] is the last matching commit of master-tmp and apache/branch-3.1.1_review Just have branched out the apache/master to a new RATIS-1931_grpc-zero-copy branch [7]. If everything looks good, how about we force push master-tmp to apache/master? Then, we can roll a release from the new master branch. Tsz-Wo [6] See the new-master_cherry-pick.sh.txt file in https://lists.apache.org/thread/27b2518ytpbkwknfpg6orzqd9vx1olxt [7] https://github.com/apache/ratis/tree/RATIS-1931_grpc-zero-copy [8] 5e8ef17 RATIS-1994. AsyncApi send() to support optional replication level. (#1006) [9] d621c14 Revert "RATIS-2099. Cache TermIndexImpl instead of using anonymous class (#1100)" On Thu, May 22, 2025 at 6:39 PM Tan Xinyu <[email protected]> wrote: > Hi, Tsz-wo > > It appears that this commit is 206 commits ahead of the Ratis master > branch and 235 commits behind. However, upon closer inspection, it seems > that some identical commits were not recognized due to a change in the > submitter. Does this imply that only 29 commits related to gRPC zero-copy > have been removed? If so, then I have no concerns whatsoever. I can proceed > with building 3.2.0rc1 based on the current commit. > > Best > ------------ > Xinyu Tan > > ________________________________ > 发件人: Tsz-Wo Nicholas Sze <[email protected]> > 发送时间: 2025年5月22日 16:45 > 收件人: [email protected] <[email protected]> > 主题: Re: [Discussion] Apache Ratis Release 3.1.4 > > Hi Xinyu, > > Just merged all the latest commits to the master-tmp branch [2]; see also > the attached file. > > Tsz-Wo > [2] https://github.com/szetszwo/ratis/tree/master-tmp > > > On Tue, May 20, 2025 at 8:35 PM Tsz-Wo Nicholas Sze <[email protected] > <mailto:[email protected]>> wrote: > 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]<mailto: > [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]<mailto:[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] > <mailto:[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 > >> > > >
