Re: [VOTE] Apache Ratis Release 3.1.0 rc0

[Tsz Wo Sze]

Hi William,

> It turned out that RaftServerImpl is refactored after Zero-Copy patches,
leading to many conflicts to solve. ...

When I was debugging the test failures, I generated a script to cherry-pick
all the commits and then manually excluded the zero-copy issues; see the
attached a.txt file.  The conflicts actually were easy to resolve (mostly
replacing ReferenceCountedObject<T> with T, i.e. don't use
ReferenceCountedObject).  I pushed a new branch
https://github.com/apache/ratis/tree/branch-3.1.0 , which includes all the
commits except for the zero-copy issues.  How about we use it for the 3.1.0
release?

Tsz-Wo

echo 'DO NOT directly execute this script!  Copy & paste the cherrp-pick 
commands and manually fix the conflicts and amend the commit messages' ; exit 1;

git reset --hard 5e8ef17e7a17042c99875d398c9e9b9cee8a3ac4
 #RATIS-1952
git cherry-pick 59dfd35491df2346de80a685365b14da52f6bc1f #RATIS-1998
git cherry-pick 206205810db1cab29987b2331dac205aafd62497 #RATIS-1989
git cherry-pick 863c2e8a069337f1dd1ae3f2520d118a443fa612 #RATIS-1987
git cherry-pick 6671ef6839e55469333f2f88935fe2d924e6ae5b #RATIS-1999
git cherry-pick 24482561f98e9f9b0555dffbddd92111af303724 #RATIS-2001
git cherry-pick eae0d18eb3a33da5ddf4a20a79cd24c95c8c9e7a #RATIS-2005
git cherry-pick 859a41074c9d896563c95d1451a44267276d72be #RATIS-2006
git cherry-pick 14eb0bf057c89954a05e7d5c9915f71074591d47 #RATIS-2002
 #RATIS-1990
git cherry-pick 82f7b3b851211e35056ebf592a90829649568cdb #RATIS-2003
git cherry-pick fc5c7256096c6f5b85308b47a1b2e5242ded4d03 #RATIS-2004
 #RATIS-2009
 #RATIS-1934
git cherry-pick 561cd6d48ab95ff72bbfd4a89c9074581d2ad1bf #RATIS-2010
git cherry-pick c1e0ec284aa88078db63a8b3cc1a90231144eff3 #RATIS-2013
git cherry-pick 0e247578bf46cd0ffdc9863da3ff77ba21753a37 #RATIS-1972
git cherry-pick ea1341b05dbaedb7b9775fa870522bf1de052a0e #RATIS-2012
git cherry-pick 79923c2d79c70dcf642c2c4bd24cfbf2501d0090 #RATIS-2008
 #RATIS-2007
git cherry-pick a18d08c89cd92e52a6c5c075fed3df59012ce4b6 #RATIS-2015
git cherry-pick 5560718aba3ec9cb1447f7305ba4e23b2567effa #RATIS-2011
git cherry-pick 7d587ec03c3d6e592a1fd544d93094fdeb229c45 #RATIS-2017
git cherry-pick 035cd968f934f4a8f9d9ccec082f86b0e6437aab #RATIS-2016
git cherry-pick 9cd74a21da9c007168e90b78a4ea2ee83dfdab49 #RATIS-1974
#RATIS-2018
git cherry-pick cf897f02957bce7ab587a895143405c914adbf91 #RATIS-1973
git cherry-pick d2f1c57fe60e3abe1bbfa1820297f9d60736bb42 #RATIS-2019
#RATIS-1978
git cherry-pick a2cb49e8cb64c30c1f7f7adb82f87477501f522d #RATIS-1975
git cherry-pick e44de26623a6b65d9d66eb782df70ffd98fab364 #RATIS-1976: conflict 
LeaderElectionTests

git cherry-pick 4f5612fd89f4ff63a8f529d1517edc663cf84ec2 #RATIS-2023
#RATIS-1997
git cherry-pick 1d99921ef4bf676029cf231faf2ca79eff59f44b #RATIS-2024: conflict 
RaftServerImpl

git cherry-pick 16b6536e220ccbc8f9228b4fccfab8eb823ee83e #RATIS-2025
git cherry-pick 67b76509d1d5b0037b278f1808bb0f5ecd7aceed #RATIS-2021
git cherry-pick 044b111d991a619a7c2edcef235e28a7c623f090 #RATIS-2027: amend 
commit message

#RATIS-2020
git cherry-pick 1bd451046b2d33fe063712d7e811262bef580a4e #RATIS-2038
git cherry-pick df436c73f66f192a2fb9f8e43500196e4e3a7cec #RATIS-2035
git cherry-pick 99a833c29eb28203cc6107ede26318ff86e636e1 #RATIS-2031
#RATIS-2028
git cherry-pick 422cb9d4cb3f6be8e3169797d11a3c2e666c138f #RATIS-2043
git cherry-pick 44a4f1fb73a073589a4563d492f6acfc68ce4a5d #RATIS-2044
git cherry-pick 72c060d9cc524045ce55e830db070c5514f23ed4 #RATIS-2045
git cherry-pick c3d615b4f28b92e1d271b84752f1c9b0fc23341c #RATIS-2047
git cherry-pick be497d5c472038242f8493ef5e56b56b7ce69ef1 #RATIS-2048
git cherry-pick 0f631fef459b1263f266fa443fdb26cfbc2f0a75 #RATIS-2036
git cherry-pick 54c2b1f7f82c5cb66fa6b652a29ff9cef22bf4b1 #RATIS-2049
git cherry-pick 14dbbf3d7cf8c78788fe7be93abf100c7dd52580 #RATIS-2050
#RATIS-2026
git cherry-pick a99e709fee3b922338936c6173e307ef221ef165 #RATIS-2052
#RATIS-1979
git cherry-pick f40424422b692349b5496ee30e24335c8186093b #RATIS-2051: conflict 
TransactionContextImpl

git cherry-pick bc6221b32fff9022cebb02bb243aea9fff35e290 #RATIS-1519
git cherry-pick 8638a2ffa802de576aae546c22160da3d9339a8f #RATIS-2040
git cherry-pick 49b4006015699625c445d70e2113fd5904b4590d #RATIS-1504: amend 
commit message

git cherry-pick 8913a999dd79cda58d18e17f4dd7971dda7070b7 #RATIS-2056
git cherry-pick cf9d2292a9f53792a7765da41e3b4b903c0ec1d9 #RATIS-2057
#RATIS-2059
git cherry-pick 8704cd23d3b38a90780ef34a7ed5f7c417ea1207 #RATIS-2055: conflict 
RaftServerImpl

git cherry-pick 7f1b1b6be29fd0b8675e30be511b03f6342ad7e6 #RATIS-2060
git cherry-pick b0ec1143c49e61525baf5da935a3509a59246883 #RATIS-2061
git cherry-pick 1fe59e07dff9b02e46d150de8b46ed2d4fc3abce #RATIS-2065
git cherry-pick 4e3eee7c9f603d89b701921c3ab877134b342f0e #RATIS-2069
git cherry-pick 51244e42cabb98f7ac9ca144e311222d9c6e5a45 #RATIS-2068
git cherry-pick cbd9793a0e315276d370dbfc5dd6a75ccf67f454 #RATIS-2070
git cherry-pick 6fc42220bc8e39cf8f242f3205abcd4dce8bbe44 #RATIS-2071
git cherry-pick 58671923e78a10d5c6a7d49a06e2d95690d5e9bb #RATIS-2072
git cherry-pick 839f8fb265983b5ce14cf2cb3650a70d342ffc04 #RATIS-2073
git cherry-pick 3888520717402da8638b85ae17f1ab494ecd2872 #RATIS-2067
git cherry-pick ac05d64f3f846d56658442896a39f4f5fd7495a2 #RATIS-2074
git cherry-pick e1765016323735124e3aaa5cee44688d49d48791 #RATIS-2078
#RATIS-2080
git cherry-pick da9eee0fbd05ed5a8ede417ad098e679ef3254bb #RATIS-2087
git cherry-pick 0814b896bed41cc3b5e3d99e4e678fed67909874 #RATIS-2086
#Revert "RATIS-2080
git cherry-pick c10e7bc8dce8ebea031592b56f90af4cd40235fd #RATIS-2076
#RATIS-2077
git cherry-pick 8bc09bbe57fb4e58f8a1367969b5538a34b4ce2b #RATIS-2085
git cherry-pick 599835dbab1e5dac2aaa4571f7c54d38c181b50f #RATIS-2083
git cherry-pick 29bba5943ae9c7b5d538da62de683edc2eb9d8f0 #RATIS-2088
git cherry-pick 192ce4880866bc05aa09fd3fec3431dbb9ab8e8c #RATIS-2090
git cherry-pick c81902a094344d953f2fc5f5d7ed08dc7c171cdf #RATIS-2066
git cherry-pick 9cfd1bf71f523262928cbe09685696ae71dab8e7 #RATIS-2091
git cherry-pick 8c7c444ca2453831bbaf1e5a5f4cb7ba76b232ff #RATIS-2081
git cherry-pick 16f2508d0b6606970d0a1accf7591461e6ec55df #RATIS-2098
#RATIS-2092
git cherry-pick 64ae88f017cb0fd5649bd465027bd524296ada11 #RATIS-2097
git cherry-pick 1782cd9f171519c8fd9006f24cbfe6fab91a1daf #RATIS-2099
#RATIS-2096
#RATIS-2093
git cherry-pick 93eb32a8620fdd4e5119592ef32bc50590810c7b #RATIS-2101
git cherry-pick 640749bb39a435eef9dac4a9fec2cdc75b6a939e #RATIS-2100
git cherry-pick dd75ffbfb94dcd624be0e75171e5c54a12b029b2 #RATIS-2089
git cherry-pick bd4ab145d6b1a72d8ed84eab918cda4e61f08681 #RATIS-2102
git cherry-pick 924a0cdf43557d67209805627bd6b1ec941776f0 #RATIS-2084
#RATIS-2094
git cherry-pick bf13033547dcb4a27938f9e5f0a923de47a59f45 #RATIS-2106
git cherry-pick dac27e4fd3df042fcf50ed549404e4d82708ed2b #RATIS-2109
git cherry-pick e540e46b8b341c8df1687f030cafd5cbe51d4600 #RATIS-2112
git cherry-pick 25a41e36f4c94b9a3e37ca9c27feeb893206cb79 #RATIS-2111: amend 
commit message