Review fixes: - New configuration variable 'replication_protocol' is defined in the configuration file. The original patch would hand-craft it into generated files. - Simplified numeric version id generation. - Removed timeouts from new sio_* calls. They did't quite work, especially with blocking sockits. Timeouts should at least use select(), which updates wait time on exit.. - Removed include cfg/tarantool_box_cfg.h into recovery.cc, instead passed around all arguments explicitly. - Removed unused headers. - reused handshake code in master and replica - simplified handshake in replica fiber - removed clutter - touched here and there.
Showing
- CMakeLists.txt 2 additions, 3 deletionsCMakeLists.txt
- cfg/tarantool_box_cfg.c 30 additions, 23 deletionscfg/tarantool_box_cfg.c
- cfg/tarantool_box_cfg.h 4 additions, 3 deletionscfg/tarantool_box_cfg.h
- include/log_io.h 1 addition, 1 deletioninclude/log_io.h
- include/recovery.h 7 additions, 8 deletionsinclude/recovery.h
- include/replication.h 8 additions, 0 deletionsinclude/replication.h
- include/sio.h 24 additions, 37 deletionsinclude/sio.h
- include/tarantool.h 7 additions, 0 deletionsinclude/tarantool.h
- include/tarantool/config.h.cmake 4 additions, 0 deletionsinclude/tarantool/config.h.cmake
- src/box/box.cc 16 additions, 5 deletionssrc/box/box.cc
- src/box/box_cfg.cfg_tmpl 5 additions, 0 deletionssrc/box/box_cfg.cfg_tmpl
- src/log_io.cc 1 addition, 1 deletionsrc/log_io.cc
- src/recovery.cc 36 additions, 99 deletionssrc/recovery.cc
- src/replica.cc 7 additions, 19 deletionssrc/replica.cc
- src/replication.cc 67 additions, 57 deletionssrc/replication.cc
- src/sio.cc 49 additions, 118 deletionssrc/sio.cc
- src/tarantool.cc 9 additions, 1 deletionsrc/tarantool.cc
- test/box/admin.result 7 additions, 6 deletionstest/box/admin.result
- test/box/configuration.result 7 additions, 6 deletionstest/box/configuration.result
- test/box/lua.result 13 additions, 10 deletionstest/box/lua.result
Loading
Please register or sign in to comment