Branch: refs/heads/master
Home: https://github.com/tarantool/tarantool
Commit: 7c7a15135463651eeb3486746f32e473f9daeb87
https://github.com/tarantool/tarantool/commit/7c7a15135463651eeb3486746f32e473f9daeb87
Author: Alexandr <[email protected]>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M include/recovery.h
M src/box/request.cc
M src/box/request.h
M test/box/admin.result
M test/box/lua_misc.result
M test/box/stat.result
Log Message:
-----------
partially commited set_lsn command
Commit: b29b346478ef36b494b8e906f1539cc804243b98
https://github.com/tarantool/tarantool/commit/b29b346478ef36b494b8e906f1539cc804243b98
Author: Alexandr <[email protected]>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M CMakeLists.txt
M debian/changelog
M debian/control
M debian/rules
M include/errcode.h
M include/recovery.h
M include/scoped_guard.h
M include/tarantool/config.h.cmake
M src/CMakeLists.txt
M src/box/alter.cc
M src/box/box_lua.cc
M src/box/box_lua_space.cc
M src/box/index.cc
M src/box/index.h
M src/box/key_def.cc
M src/box/key_def.h
M src/box/lua/schema.lua
M src/box/schema.cc
M src/box/schema.h
M src/box/space.cc
M src/box/tuple.cc
M src/box/tuple.h
M src/log_io.cc
M src/recovery.cc
M src/tarantool.cc
M test/box/alter.result
M test/box/alter.test.lua
A test/box/alter_limits.result
A test/box/alter_limits.test.lua
M test/box/lua.result
M test/box/lua.test.py
M test/box/lua_misc.result
M test/lib/sql_ast.py
M test/lib/test_suite.py
A test/wal/alter.result
A test/wal/alter.test.lua
M test/wal/oom.result
M test/wal/oom.test.lua
M third_party/tarantool_ev.c
M third_party/tarantool_ev.h
Log Message:
-----------
Merge branch 'master' into transferring-snapshot-to-replica
Commit: 7340c6a4c85e0a1ebb25ecc2eeced1190ef6d05c
https://github.com/tarantool/tarantool/commit/7340c6a4c85e0a1ebb25ecc2eeced1190ef6d05c
Author: Alexandr <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M include/recovery.h
M src/log_io.cc
M src/recovery.cc
M src/replica.cc
M src/replication.cc
Log Message:
-----------
added master/replica handshake + transferring snapshot
Commit: 0a2a5f8f5b5c92b81d299050896ac769d622b819
https://github.com/tarantool/tarantool/commit/0a2a5f8f5b5c92b81d299050896ac769d622b819
Author: Alexandr <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M src/recovery.cc
Log Message:
-----------
minor bugs fixed
Commit: 4faaf69e465a4198fe6611de59adc206c900b64c
https://github.com/tarantool/tarantool/commit/4faaf69e465a4198fe6611de59adc206c900b64c
Author: Alexandr <[email protected]>
Date: 2013-09-16 (Mon, 16 Sep 2013)
Changed paths:
M src/recovery.cc
M src/replication.cc
Log Message:
-----------
minor bugs fixed
Commit: 283138a3909a015a495105fdcf5c46f35ff38ebb
https://github.com/tarantool/tarantool/commit/283138a3909a015a495105fdcf5c46f35ff38ebb
Author: Alexandr <[email protected]>
Date: 2013-09-18 (Wed, 18 Sep 2013)
Changed paths:
M include/recovery.h
M include/sio.h
M src/box/request.cc
M src/box/request.h
M src/log_io.cc
M src/recovery.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
M test/box/admin.result
M test/box/lua_misc.result
M test/box/stat.result
Log Message:
-----------
new attempt for master/replica connect
Commit: 44eaf0959fdf239171e269a405f4504544f84345
https://github.com/tarantool/tarantool/commit/44eaf0959fdf239171e269a405f4504544f84345
Author: Alexandr <[email protected]>
Date: 2013-09-18 (Wed, 18 Sep 2013)
Changed paths:
M src/recovery.cc
Log Message:
-----------
simple fix
Commit: edffab41248267da716b8b5546ab484a77e05470
https://github.com/tarantool/tarantool/commit/edffab41248267da716b8b5546ab484a77e05470
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M CMakeLists.txt
M include/recovery.h
M include/sio.h
M include/tarantool/config.h.cmake
M src/recovery.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
Log Message:
-----------
minor fixes master-replica
Commit: d727d98a9740fc3e37c540f2f100244f61dd6316
https://github.com/tarantool/tarantool/commit/d727d98a9740fc3e37c540f2f100244f61dd6316
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
A src/replica.1.5.cc
Log Message:
-----------
added old (1.5) version of replica.cc
Commit: b00d82bc4f9ecfaab816a54f45e1cae175d2b291
https://github.com/tarantool/tarantool/commit/b00d82bc4f9ecfaab816a54f45e1cae175d2b291
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M connector/c/tntrpl/tnt_rpl.c
Log Message:
-----------
tests fixed
Commit: ca5357ca3f78f75b7b6d0b295e8569505c2e03e2
https://github.com/tarantool/tarantool/commit/ca5357ca3f78f75b7b6d0b295e8569505c2e03e2
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
A test/replication/repl.snap.result
A test/replication/repl.snap.test.py
Log Message:
-----------
tests added
Commit: dd7322784b325eec9054670b35d8de9d2c954d00
https://github.com/tarantool/tarantool/commit/dd7322784b325eec9054670b35d8de9d2c954d00
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M test/replication/repl.snap.test.py
Log Message:
-----------
tests fixed
Commit: c03976a4527b4295ec60474daef3afb0eba34c40
https://github.com/tarantool/tarantool/commit/c03976a4527b4295ec60474daef3afb0eba34c40
Author: Alexandr <[email protected]>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M test/replication/repl.snap.test.py
Log Message:
-----------
test fixes (2)1
Commit: 7d5b0f063e5421e5d61471b8b8fdbb9416df1c30
https://github.com/tarantool/tarantool/commit/7d5b0f063e5421e5d61471b8b8fdbb9416df1c30
Author: Alexandr <[email protected]>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
M test/replication/repl.snap.result
Log Message:
-----------
replica test result updated
Commit: 2ee7590aab38c30dcc4242f63f8dfde3d82bdb6f
https://github.com/tarantool/tarantool/commit/2ee7590aab38c30dcc4242f63f8dfde3d82bdb6f
Author: Alexandr <[email protected]>
Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths:
M CMakeLists.txt
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M include/recovery.h
M include/sio.h
M src/CMakeLists.txt
M src/box/box.cc
M src/recovery.cc
M src/replica.1.5.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
Log Message:
-----------
fixes according to CR
Commit: 7ef52cfd9a85c0a80c16e920bcfd877e2839f506
https://github.com/tarantool/tarantool/commit/7ef52cfd9a85c0a80c16e920bcfd877e2839f506
Author: Alexandr <[email protected]>
Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths:
M connector/c/tntrpl/tnt_rpl.c
Log Message:
-----------
minor test fixes
Commit: 673a2944499a1943883deccdc6adbd76113e79a4
https://github.com/tarantool/tarantool/commit/673a2944499a1943883deccdc6adbd76113e79a4
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-05 (Sat, 05 Oct 2013)
Changed paths:
M .gitmodules
M CMakeLists.txt
M cfg/warning.c
M cfg/warning.h
M client/tarantool/tc.c
M client/tarantool/tc_buf.c
M client/tarantool/tc_buf.h
M client/tarantool/tc_cli.c
M client/tarantool/tc_opt.c
M client/tarantool/tc_print_snap.c
M client/tarantool/tc_print_xlog.c
M cmake/BuildMisc.cmake
M doc/user/configuration-reference.xml
M doc/user/language-reference.xml
M doc/user/persistence-architecture.xml
M doc/user/preface.xml
M doc/user/replication.xml
M doc/user/stored-procedures.xml
M doc/user/target.db
M extra/rpm.spec.in
M extra/tarantool_box
M extra/tarantool_deploy.sh
M include/errcode.h
M include/fiber.h
M include/log_io.h
A include/qbuf.h
M include/recovery.h
M include/salloc.h
M include/session.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M include/tarantool/util.h
M src/admin.cc
A src/admin.rl
M src/box/alter.cc
M src/box/box.cc
M src/box/box_lua.cc
M src/box/box_lua_space.cc
M src/box/key_def.cc
M src/box/key_def.h
M src/box/lua/schema.lua
M src/box/schema.cc
M src/box/space.cc
M src/box/space.h
M src/box/tuple.cc
M src/box/tuple.h
M src/box/txn.cc
M src/coio.cc
M src/fiber.cc
M src/iproto.cc
M src/log_io.cc
M src/lua/fiber.cc
M src/lua/init.cc
R src/memcached-grammar.cc
M src/recovery.cc
M src/salloc.cc
M src/say.cc
M src/session.cc
M src/tarantool.cc
M test/big/sql.result
M test/big/sql.test.py
M test/big/tree_pk_multipart.result
M test/big/tree_variants.result
M test/big/tree_variants.test.lua
M test/box/admin.result
A test/box/admin.test.lua
R test/box/admin.test.py
M test/box/alter_limits.result
M test/box/alter_limits.test.lua
M test/box/bad_trigger.result
M test/box/bad_trigger.test.py
M test/box/errinj.result
M test/box/errinj.test.lua
M test/box/fiber.result
M test/box/fiber.test.lua
M test/box/iproto.result
M test/box/lua.result
M test/box/lua.test.py
M test/box/lua_misc.result
M test/box/lua_misc.test.lua
M test/box/reconfigure.result
M test/box/reconfigure.test.py
A test/box/snap_io_rate_limit.cfg
M test/box/snapshot.result
M test/box/snapshot.test.py
M test/box/sql.result
M test/box/sql.test.py
M test/box/stat.result
A test/box/stat.test.lua
R test/box/stat.test.py
A test/box/temp_spaces.result
A test/box/temp_spaces.test.lua
M test/lib/box_connection.py
M test/lib/sql_ast.py
A test/lib/tarantool-python
M test/lib/tarantool_connection.py
M test/lib/tarantool_server.py
M test/lib/test_suite.py
M test/replication/swap.result
M test/replication/swap.test.py
M test/wal/oom.result
A third_party/open_memstream.c
Log Message:
-----------
Merge branch 'master' into transferring-snapshot-to-replica
Conflicts:
CMakeLists.txt
Commit: c67278ce9600c8f4d5f027848d138b1088670d06
https://github.com/tarantool/tarantool/commit/c67278ce9600c8f4d5f027848d138b1088670d06
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M CMakeLists.txt
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M include/log_io.h
M include/recovery.h
M include/replication.h
M include/sio.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M src/box/box.cc
M src/box/box_cfg.cfg_tmpl
M src/log_io.cc
M src/recovery.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
M src/tarantool.cc
M test/box/admin.result
M test/box/configuration.result
M test/box/lua.result
Log Message:
-----------
https://blueprints.launchpad.net/tarantool/+spec/start-replication-last-dump
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.
Commit: a33e75ae4bf9b4f886aaed799c9d6ad1682dc6fb
https://github.com/tarantool/tarantool/commit/a33e75ae4bf9b4f886aaed799c9d6ad1682dc6fb
Author: Konstantin Osipov <[email protected]>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M CMakeLists.txt
M cfg/tarantool_box_cfg.c
M cfg/tarantool_box_cfg.h
M connector/c/tntrpl/tnt_rpl.c
M include/log_io.h
M include/recovery.h
M include/replication.h
M include/sio.h
M include/tarantool.h
M include/tarantool/config.h.cmake
M src/CMakeLists.txt
M src/box/box.cc
M src/box/box_cfg.cfg_tmpl
M src/log_io.cc
M src/recovery.cc
A src/replica.1.5.cc
M src/replica.cc
M src/replication.cc
M src/sio.cc
M src/tarantool.cc
M test/box/admin.result
M test/box/configuration.result
M test/box/lua.result
A test/replication/repl.snap.result
A test/replication/repl.snap.test.py
Log Message:
-----------
Merge branch 'transferring-snapshot-to-replica'
Compare:
https://github.com/tarantool/tarantool/compare/f6a227a2d254...a33e75ae4bf9
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
