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]> 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]> 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 >> >> >> > >> >
echo This script $0 is NOT for running directly. exit 1 ################ git cherry-pick fde8c7d4f37f37c61d5e270cf069a8a604ea0d6e #RATIS-2242 change consistency criteria of heartbeat during appendLog (#1215) #Conflict: RaftServerImpl, RaftServerProxy # fix commit message # checkstyle: unused import git cherry-pick 72c17652f0bd8446f59fd13ed9e295c278e1fb95 #RATIS-2269. Remove all import java.util.* statements. (#1243) # checkstyle: SegmentedRaftLogCache.java git cherry-pick 0fd4b3a3869b33c96148887960ae90caa2cd6baf #RATIS-2209. Exercise make_rc.sh in CI (#1244) git cherry-pick 688bbaee7b7b388c0e1eaf49b210a6a3877e4bd4 #RATIS-2271 Leadership Loss Causes ClosedByInterruptException and NullPointerException in LogAppender Thread (#1245) # Conflict: LogSegment.java git cherry-pick 7be7cb80f5e83e6e47721675cf1945a8d566ab8d #RATIS-2274. Newly added peer may retain outdated configuration after membership change, causing election failure. (#1246) # git cherry-pick f5e993549330708d85570af8462ee00c879aba2c #RATIS-2278. Follower Fails to Append Entries Due to Index Validation in NavigableIndices (#1247) # git cherry-pick ca81a218f31b4e686bcfdb1d5cb3eb5a8c0ce8fd #Revert "RATIS-2278. Follower Fails to Append Entries Due to Index Validation in NavigableIndices (#1247)" git cherry-pick de58f05bbd5d2773a6719d34d288ec9ad7a57abd #RATIS-2282. LogAppender Restart Due to Premature Log Entry Access During Concurrent Write Processing (#1249) # Conflict: LogSegment.java git cherry-pick 8ab57e1c064c6ccfec504597289590ac7ce7b106 #RATIS-2278. Follower Fails to Append Entries Due to Index Validation Race Condition in NavigableIndices (#1248) # Conflict: RaftServerImpl.java git cherry-pick 3247c7f2bd060029f93d4a94cef9224be3257fec #RATIS-2283. GrpcLogAppender Thread Restart Leaves catchup=false, Blocking Reconfiguration Progress (#1250) git cherry-pick c36dac066af4026a90a161df7822e5e957c1ce77 #RATIS-2285. Bump ratis-thirdparty to 1.0.9 (#1252) git cherry-pick d637a93ea12c145aafc6d2a6f1e14517fdecd191 #RATIS-2286. Generate the necessary unified names for the submodules under RaftServerImpl (#1251) git cherry-pick 3babac349827d7912c4058183c310fde2d32ff54 #RATIS-2287. Improve RaftServerImpl#toString() to make it more readable (#1253) git cherry-pick 7f85d46dfebd123b72a3728fe8c2d23ee476bd0f #RATIS-2289. Coverage is 0% due to no execution data files provided (#1255) git cherry-pick 21f9e5b707265e9ff7c8be6c98d6704412f85eb2 #RATIS-2180. Use Objects.requireNonNull instead of Preconditions.assertNotNull (#1256) # Conflict: SegmentedRaftLogCache.java git cherry-pick b0f5330aeae83c41e19be6759fe56240f6f6c105 #RATIS-2291. Fix failing TestInstallSnapshotNotificationWithGrpc#testAddNewFollowersNoSnapshot. (#1257) # Conflict: MiniRaftCluster.java git cherry-pick 282d7a1b9b09a072c80163f92c197c82de0ae7f8 #RATIS-2290. Simply the EventQueue in leader (#1258) git cherry-pick 65fd4445335d0500fd372f37c8b7cb3c39259e87 #RATIS-1995. Prevent data loss when a storage is accidentally re-formatted. (#1261) git cherry-pick 2eda35dd532f503b299db9e3263ecbeca52da023 #RATIS-2293. Fix typo in ClientProtoUtils (#1263) git cherry-pick 863454270d16d0d934b3449c570357366c7ed407 #RATIS-2294. Fix NettyClientRpc exception and timeout handling (#1264) git cherry-pick 0557974fa2d7409e9f5089a780a4b6024c53ec99 #RATIS-2251. Migrate ratis-test tests to Junit 5 - Part 3. (#1227) # Conflict: RaftTestUtil.java, RaftSnapshotBaseTest.java git cherry-pick 6e2cafb6b7c18e7322079e0fa0ca2548a3bcd55f #RATIS-2304. SnapshotManager should validate snapshot file path (#1268)
