From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id B3BB646970E for ; Mon, 30 Dec 2019 20:47:05 +0300 (MSK) From: Ilya Kosarev Date: Mon, 30 Dec 2019 20:46:59 +0300 Message-Id: Subject: [Tarantool-patches] [PATCH 0/2] fix vlock obtainment on join & join_vclock test List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: v.shpilevoy@tarantool.org First patch fixes vclock obtainment on join for master, as far as in case of high load vclock used to join replica could be in advance comparing to an actual WAL and therefore replica could have missed some tuples from master. Second patch fixes flaky join_vclock test and splits off explicit test for changes apply order on replica. Branch: https://github.com/tarantool/tarantool/tree/i.kosarev/gh-4160-fix-join-vclock Issue: https://github.com/tarantool/tarantool/issues/4160 1st patch is for master. 2nd patch is for all branches. Ilya Kosarev (2): relay: fix vclock obtainment on join test: fix and split flaky join_vclock test src/box/relay.cc | 7 +- src/box/vinyl.c | 4 +- src/box/wal.c | 23 +++- src/box/wal.h | 4 +- test/replication/join_vclock.result | 61 ++++++--- test/replication/join_vclock.test.lua | 45 ++++--- test/replication/master1.lua | 1 + test/replication/replica_apply_order.result | 121 ++++++++++++++++++ test/replication/replica_apply_order.test.lua | 48 +++++++ test/replication/suite.ini | 1 - 10 files changed, 263 insertions(+), 52 deletions(-) create mode 120000 test/replication/master1.lua create mode 100644 test/replication/replica_apply_order.result create mode 100644 test/replication/replica_apply_order.test.lua -- 2.17.1