From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id C91D729C85 for ; Thu, 16 Aug 2018 15:06:15 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RFRPyVKDp4dj for ; Thu, 16 Aug 2018 15:06:15 -0400 (EDT) Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 605D222EF9 for ; Thu, 16 Aug 2018 15:06:15 -0400 (EDT) Received: by mail-lf1-f51.google.com with SMTP id b22-v6so4187828lfa.3 for ; Thu, 16 Aug 2018 12:06:15 -0700 (PDT) From: Olga Arkhangelskaia Subject: [tarantool-patches] [PATCH] replication: adds replication sync after cfg. update Date: Thu, 16 Aug 2018 22:05:21 +0300 Message-Id: <20180816190521.9310-1-krishtal.olja@gmail.com> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: Olga Arkhangelskaia When replica reconnects to replica set not for the first time, we suffer from absence of data sync. Such behavior leads to giving away outdated data. Closes #3427 --- https://github.com/tarantool/tarantool/issues/3427 https://github.com/tarantool/tarantool/tree/OKriw/replication_no_sync-1.9 src/box/box.cc | 2 + test/replication/orphan.result | 103 ++++++++++++++++++++++++++++++++++++ test/replication/orphan.test.lua | 47 ++++++++++++++++ test/replication/replica_orphan.lua | 11 ++++ 4 files changed, 163 insertions(+) create mode 100644 test/replication/orphan.result create mode 100644 test/replication/orphan.test.lua create mode 100644 test/replication/replica_orphan.lua diff --git a/src/box/box.cc b/src/box/box.cc index 8d7454d1f..af8a3ccd9 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -634,6 +634,8 @@ box_set_replication(void) box_sync_replication(true); /* Follow replica */ replicaset_follow(); + /* Sync replica up to quorum */ + replicaset_sync(); } void diff --git a/test/replication/orphan.result b/test/replication/orphan.result new file mode 100644 index 000000000..2230d4546 --- /dev/null +++ b/test/replication/orphan.result @@ -0,0 +1,103 @@ +-- +-- gh-3427: no sync after configuration update +-- +env = require('test_run') +--- +... +test_run = env.new() +--- +... +engine = test_run:get_cfg('engine') +--- +... +box.schema.user.grant('guest', 'read,write,execute', 'universe') +--- +... +box.schema.user.grant('guest', 'replication') +--- +... +test_run:cmd("create server replica with rpl_master=default, script='replication/replica_orphan.lua'") +--- +- true +... +test_run:cmd("start server replica") +--- +- true +... +repl = test_run:eval('replica', 'return box.cfg.listen')[1] +--- +... +box.cfg{replication = repl} +--- +... +test_run:cmd("switch replica") +--- +- true +... +test_run:cmd("switch default") +--- +- true +... +s = box.schema.space.create('test', {engine = engine}); +--- +... +index = s:create_index('primary') +--- +... +-- change replica configuration +test_run:cmd("switch replica") +--- +- true +... +box.cfg{replication={}} +--- +... +test_run:cmd("switch default") +--- +- true +... +-- insert values on the master while replica is unconfigured +a = 100000 while a > 0 do a = a-1 box.space.test:insert{a,'A'..a} end +--- +... +test_run:cmd("switch replica") +--- +- true +... +box.cfg{replication = os.getenv("MASTER")} +--- +... +test_run:cmd("switch default") +--- +- true +... +test_run:cmd("switch replica") +--- +- true +... +box.info.replication[1].upstream.lag > 1 +--- +- false +... +test_run:cmd("switch default") +--- +- true +... +-- cleanup +test_run:cmd("stop server replica") +--- +- true +... +test_run:cmd("cleanup server replica") +--- +- true +... +box.space.test:drop() +--- +... +box.schema.user.revoke('guest', 'replication') +--- +... +box.schema.user.revoke('guest', 'read,write,execute', 'universe') +--- +... diff --git a/test/replication/orphan.test.lua b/test/replication/orphan.test.lua new file mode 100644 index 000000000..25522f5ac --- /dev/null +++ b/test/replication/orphan.test.lua @@ -0,0 +1,47 @@ +-- +-- gh-3427: no sync after configuration update +-- + +env = require('test_run') +test_run = env.new() +engine = test_run:get_cfg('engine') + +box.schema.user.grant('guest', 'read,write,execute', 'universe') + +box.schema.user.grant('guest', 'replication') +test_run:cmd("create server replica with rpl_master=default, script='replication/replica_orphan.lua'") +test_run:cmd("start server replica") + +repl = test_run:eval('replica', 'return box.cfg.listen')[1] +box.cfg{replication = repl} + +test_run:cmd("switch replica") +test_run:cmd("switch default") + +s = box.schema.space.create('test', {engine = engine}); +index = s:create_index('primary') + +-- change replica configuration +test_run:cmd("switch replica") +box.cfg{replication={}} + +test_run:cmd("switch default") +-- insert values on the master while replica is unconfigured +a = 100000 while a > 0 do a = a-1 box.space.test:insert{a,'A'..a} end + +test_run:cmd("switch replica") +box.cfg{replication = os.getenv("MASTER")} + +test_run:cmd("switch default") +test_run:cmd("switch replica") + +box.info.replication[1].upstream.lag > 1 +test_run:cmd("switch default") + +-- cleanup +test_run:cmd("stop server replica") +test_run:cmd("cleanup server replica") +box.space.test:drop() +box.schema.user.revoke('guest', 'replication') +box.schema.user.revoke('guest', 'read,write,execute', 'universe') + diff --git a/test/replication/replica_orphan.lua b/test/replication/replica_orphan.lua new file mode 100644 index 000000000..98573a407 --- /dev/null +++ b/test/replication/replica_orphan.lua @@ -0,0 +1,11 @@ +#!/usr/bin/env tarantool + +local TIMEOUT = tonumber(arg[1]) + +box.cfg({ + listen = os.getenv("LISTEN"), + replication = os.getenv("MASTER"), + replication_connect_timeout = 0.5, +}) + +require('console').listen(os.getenv('ADMIN')) -- 2.14.3 (Apple Git-98)