Consolidate raft state

[achamayou]

This only moves leadership_state and membership_state to raft state, to unblock #5201. Also removes the my_ suffix from node_id.

I think we should move the other state leftover across too, but there's enough going on as it is.

[ccf-bot]

consolidate_raft_state@69295 aka 20230424.22 vs main ewma over 20 builds from 68773 to 69218

Click to see table

main

build_id	build_number	Commit latency factor	tpcc_sgx_cft^	tpcc_sgx_cft_mem	tpcc_virtual_cft^	ls_virtual_cft^	pi_ls_virtual_cft^	ls_jwt_virtual_cft^	ls_sgx_cft^	ls_sgx_cft_mem	pi_ls_jwt_virtual_cft^	pi_ls_sgx_cft^	pi_ls_sgx_cft_mem	ls_js_virtual_cft^	ls_jwt_sgx_cft^	ls_jwt_sgx_cft_mem	pi_ls_jwt_sgx_cft^	pi_ls_jwt_sgx_cft_mem	ls_full_js_virtual_cft^	ls_js_jwt_virtual_cft^	ls_js_sgx_cft^	ls_js_sgx_cft_mem	hist_sgx_cft^	ls_full_js_sgx_cft^	ls_full_js_sgx_cft_mem	ls_js_jwt_sgx_cft^	ls_js_jwt_sgx_cft_mem	RB put (/s)^	CHAMP put (/s)^	RB get (/s)^	CHAMP get (/s)^
68773	20230419.13	0.790534	6266.11	8.27106e+07	17124.5	45576.1	48522.3	12754.6	15514.6	1.50774e+07	13345.8	16031.9	7.99955e+06	4435.66	5465.13	1.4291e+07	5637.9	4.06739e+06	3629.8	3255.4	1491.14	7.73741e+06	43791.9	1309.25	7.21312e+06	1226.62	6.95098e+06	833811	1.17996e+06	8.17209e+06	3.07415e+07
68786	20230419.18	0.801849	5568.73	8.27106e+07	17083.1	45807.1	48440.9	12895.1	15682.1	1.50774e+07	13037.3	16006.8	7.99955e+06	4456.78	5515.83	1.45532e+07	5588.4	4.06739e+06	3713.59	3220.27	1483.76	7.73741e+06	45255.8	1304.39	7.21312e+06	1233.77	6.95098e+06	832978	1.18074e+06	8.15478e+06	3.08578e+07
68828	20230419.29	0.792796	6240.27	8.19242e+07	17079.2	43846.6	49557	12897.5	15656.3	1.53396e+07	12785.3	15942.5	7.99955e+06	4446.35	5507.67	1.45532e+07	5596.3	4.06739e+06	3709.1	3363.49	1483.81	7.73741e+06	46145.8	1295.01	7.47526e+06	1226.82	6.95098e+06	831694	1.17711e+06	8.15504e+06	3.09595e+07
68887	20230419.51	0.784642	7321.36	8.59996e+07	17072.2	45636.7	48788.8	12721.6	20028.1	1.88908e+07	13163.6	20276.8	1.25993e+07	4439.14	6341.76	1.67936e+07	6469.9	6.30784e+06	3621.88	3270.34	1707.71	1.05021e+07	47156.8	1508.41	1.05021e+07	1403.61	1.05021e+07	830007	1.17519e+06	8.1529e+06	3.06996e+07
68891	20230419.53	0.780988	7359.59	8.59996e+07	17191.5	45739.2	49836	12641.5	20121.7	1.88908e+07	12929.4	20292.2	1.25993e+07	4406.39	6334.92	1.67936e+07	6506.3	6.30784e+06	3613.07	3269.15	1710.21	1.05021e+07	51711.9	1504.71	1.05021e+07	1400.58	1.05021e+07	787264	1.18205e+06	8.1554e+06	3.06936e+07
68940	20230419.67	0.789834	7270.63	8.59996e+07	17138.2	45671.4	48678.7	12882.5	20048.2	1.88908e+07	12808.8	20307.8	1.25993e+07	4270.59	6374.79	1.67936e+07	6469.4	6.30784e+06	3636.96	3254.13	1729.13	1.05021e+07	51249.2	1506.5	1.05021e+07	1403.07	1.05021e+07	832962	1.1784e+06	8.1553e+06	3.07332e+07
68958	20230420.3	0.784665	7334.53	8.59996e+07	17159.3	46017.4	47915.2	12237.1	20001	1.88908e+07	13991.9	20321.3	1.25993e+07	4451.79	6363.64	1.67936e+07	6508.5	6.30784e+06	3624.24	3379.41	1711.58	1.05021e+07	49608.5	1506.8	1.05021e+07	1406.62	1.05021e+07	837766	1.18099e+06	8.14855e+06	3.12552e+07
68966	20230420.5	0.801984	7299.91	8.59996e+07	17288.6	45663.2	48359.9	12431.2	20092.4	1.88908e+07	12971	20232.7	1.25993e+07	4447.46	6372.72	1.67936e+07	6471.7	6.30784e+06	3759.51	3246.43	1719.01	1.05021e+07	48908.8	1497.99	1.05021e+07	1408.32	1.05021e+07	837304	1.17461e+06	8.17369e+06	3.06637e+07
68984	20230420.11	0.785211	7304.39	8.39025e+07	17289.7	46130.4	49294.4	12557.2	20116.8	1.88908e+07	12907.2	20310.9	1.25993e+07	4446.29	6342.37	1.67936e+07	6471.7	6.30784e+06	3729.55	3225	1714.57	1.05021e+07	49773.4	1503.4	1.05021e+07	1419.3	1.05021e+07	821036	1.18118e+06	8.15313e+06	3.07563e+07
68997	20230420.14	0.792012	7302.33	8.59996e+07	17137.2	45655.5	48700.7	12387.9	19997.4	1.88908e+07	13035.6	20123.4	1.25993e+07	4426.75	6401.15	1.67936e+07	6467.4	6.30784e+06	3722.53	3274.58	1709.34	1.05021e+07	45595.4	1485.23	1.05021e+07	1403.14	1.05021e+07	800374	1.17785e+06	8.15261e+06	3.07785e+07
69009	20230420.17	0.790821	7310.58	8.59996e+07	17425.2	45832	48743.9	12420.5	20055.5	1.88908e+07	12895.6	20194	1.25993e+07	4451.21	6347.31	1.67936e+07	6493.7	6.30784e+06	3736.96	3246.12	1709.53	1.05021e+07	45249.2	1500.66	1.05021e+07	1395.68	1.05021e+07	833060	1.17626e+06	8.15115e+06	3.07891e+07
69017	20230420.19	0.799441	7283.31	8.59996e+07	17436.4	45580.1	42499	12425.3	19982.9	1.88908e+07	13071.1	20219.1	1.05021e+07	4444.03	6314.25	1.67936e+07	6479.2	6.30784e+06	3745.16	3250.18	1703.89	1.05021e+07	50727.6	1501.96	1.05021e+07	1396.86	1.05021e+07	832303	1.17936e+06	8.15329e+06	3.08123e+07
69035	20230420.26	0.806502	7305.62	8.59996e+07	17310.8	45514.6	48604.3	12414.3	20046.5	1.88908e+07	12963.1	20312.6	1.25993e+07	4447.81	6670.29	1.67936e+07	6504.1	6.30784e+06	3758.04	3349.17	1717	1.05021e+07	50978.6	1507.4	1.05021e+07	1402.82	1.05021e+07	832273	1.17067e+06	8.15598e+06	3.07549e+07
69046	20230421.3	0.808997	7334.05	8.59996e+07	17343.1	45857	48755.7	12415.9	20037	1.88908e+07	12909.2	20258.7	1.25993e+07	4444.69	6675.63	1.67936e+07	6500.1	6.30784e+06	3764.34	3343.89	1710.3	1.05021e+07	47196.3	1508.63	1.05021e+07	1420.93	1.05021e+07	833669	1.18037e+06	8.16314e+06	3.03596e+07
69139	20230421.25	0.78317	7348.46	8.59996e+07	17287.6	45595.2	48950.5	12425.8	20000.3	1.88908e+07	13176.8	20253.3	1.25993e+07	4465.41	6353.38	1.67936e+07	6496.3	6.30784e+06	3756.29	3362.34	1717.15	1.05021e+07	51217.1	1494.63	1.05021e+07	1406.31	1.05021e+07	833686	1.1848e+06	8.15475e+06	3.08132e+07
69154	20230421.29	0.802427	7269.41	8.59996e+07	17131.1	45648.7	48788.1	12343.2	20104.7	1.88908e+07	12999.8	20383.3	1.05021e+07	4450.33	6386.47	1.67936e+07	6463.5	6.30784e+06	3738.58	3375.52	1701.96	1.05021e+07	46933.3	1485.2	1.05021e+07	1393.66	1.05021e+07	832759	1.17809e+06	8.1529e+06	3.07766e+07
69170	20230421.35	0.802505	7357.12	8.59996e+07	17510.3	45912.7	48691.7	12428.3	19957	1.88908e+07	12846.2	20287.5	1.25993e+07	4466.23	6368.78	1.67936e+07	6564.1	6.30784e+06	3740.62	3275.97	1717.62	1.05021e+07	50791	1493.29	1.05021e+07	1405.73	1.05021e+07	830300	1.17624e+06	8.13874e+06	3.05663e+07
69177	20230421.37	0.770609	7284.78	8.39025e+07	17321.4	47653.4	48592.8	12422.4	19977.3	1.88908e+07	13005.4	20249.6	1.25993e+07	4406.13	6332.71	1.67936e+07	6507.5	6.30784e+06	3759.82	3268.74	1716.13	1.05021e+07	49258	1494.02	1.05021e+07	1404.73	1.05021e+07	835942	1.18082e+06	8.15176e+06	3.07905e+07
69216	20230424.3	0.793444	7330.33	8.59996e+07	17407.1	45684.2	48998.7	12444.4	20101.5	1.88908e+07	12962.6	20236	1.25993e+07	4420.6	6362.08	1.67936e+07	6514.6	6.30784e+06	3748.1	3360.91	1733.53	1.05021e+07	48968.5	1494.11	1.05021e+07	1398.69	1.05021e+07	833367	1.18008e+06	8.15524e+06	3.13337e+07
69218	20230424.4	0.821944	7241.23	8.59996e+07	17648.7	45880.5	49149.9	12477.3	19761.4	1.88908e+07	12300.7	20108.4	1.25993e+07	4307.96	6369.46	1.67936e+07	6376.7	6.30784e+06	3729.97	3261.57	1688.89	1.05021e+07	47626.4	1473.32	1.05021e+07	1385.57	1.05021e+07	839242	1.17259e+06	8.15602e+06	3.08127e+07

consolidate_raft_state

build_id	build_number	Commit latency factor	tpcc_virtual_cft^	ls_virtual_cft^	pi_ls_virtual_cft^	ls_jwt_virtual_cft^	pi_ls_jwt_virtual_cft^	ls_js_virtual_cft^	ls_full_js_virtual_cft^	ls_js_jwt_virtual_cft^	tpcc_sgx_cft^	tpcc_sgx_cft_mem	hist_sgx_cft^	ls_sgx_cft^	ls_sgx_cft_mem	pi_ls_sgx_cft^	pi_ls_sgx_cft_mem	ls_jwt_sgx_cft^	ls_jwt_sgx_cft_mem	pi_ls_jwt_sgx_cft^	pi_ls_jwt_sgx_cft_mem	ls_js_sgx_cft^	ls_js_sgx_cft_mem	ls_full_js_sgx_cft^	ls_full_js_sgx_cft_mem	ls_js_jwt_sgx_cft^	ls_js_jwt_sgx_cft_mem	RB put (/s)^	CHAMP put (/s)^	RB get (/s)^	CHAMP get (/s)^
69208	20230422.9	0.797199	17341.2	45790.9	48101.9	12738.4	12990.9	4442.01	3713.46	3203.13	7292.26	8.59996e+07	44759.9	20023.5	1.88908e+07	20248.1	1.25993e+07	6373.27	1.67936e+07	6519	6.30784e+06	1716.51	1.05021e+07	1509.55	1.05021e+07	1418.49	1.05021e+07	827555	1.17612e+06	8.05329e+06	3.06472e+07
69269	20230424.15	0.785264	17446.6	45611.1	48054.1	12425.4	13222.3	4414.2	3729.83	3244.28	7346.09	8.59996e+07	51147.4	20112.1	1.88908e+07	20342.5	1.25993e+07	6368.56	1.67936e+07	6505.4	6.30784e+06	1716.86	1.05021e+07	1509.56	1.05021e+07	1406.44	1.05021e+07	817715	1.18297e+06	8.15329e+06	3.07217e+07
69295	20230424.22	0.788231	17318.8	45822.3	48071.2	12550.7	13146.3	4436.14	3731.37	3384.05	7262.09	8.59996e+07	48353.1	20000	1.88908e+07	20258.5	1.25993e+07	6346.79	1.67936e+07	6464.9	6.30784e+06	1711.85	1.05021e+07	1488.02	1.05021e+07	1403.64	1.05021e+07	834978	1.177e+06	8.15095e+06	3.07826e+07

[heidihoward]

Sorry this is probably a very stupid question but where did the definition of leadership_state and membership_state go? I cannot see them in state.h

[heidihoward]

Found them, I think they were removed in the merge eb06ff8

[achamayou]

Found them, I think they were removed in the merge eb06ff8

Yes, my bad, should be fixed now.