From: AKhatskevich <avkhatskevich@tarantool.org> To: tarantool-patches@freelists.org, v.shpilevoy@tarantool.org Subject: [tarantool-patches] [PATCH 1/3] Fix test on bucket_transferring error Date: Wed, 6 Jun 2018 18:57:12 +0300 [thread overview] Message-ID: <ad97c931820b824e7482100976ebe3114f011260.1528300145.git.avkhatskevich@tarantool.org> (raw) In-Reply-To: <cover.1528300145.git.avkhatskevich@tarantool.org> In-Reply-To: <cover.1528300145.git.avkhatskevich@tarantool.org> --- test/router/router.result | 12 ++++++------ test/router/router.test.lua | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/router/router.result b/test/router/router.result index 101369a..5f3ceca 100644 --- a/test/router/router.result +++ b/test/router/router.result @@ -328,17 +328,17 @@ test_run:cmd('switch storage_2_a') --- - true ... -box.space._bucket:replace({1, vshard.consts.BUCKET.SENDING}) +box.space._bucket:replace({1, vshard.consts.BUCKET.SENDING, '<replicaset_1>'}) --- -- [1, 'sending'] +- [1, 'sending', '<replicaset_1>'] ... test_run:cmd('switch storage_1_a') --- - true ... -box.space._bucket:replace({1, vshard.consts.BUCKET.RECEIVING}) +box.space._bucket:replace({1, vshard.consts.BUCKET.RECEIVING, '<replicaset_2>'}) --- -- [1, 'receiving'] +- [1, 'receiving', '<replicaset_2>'] ... test_run:cmd('switch router_1') --- @@ -353,7 +353,7 @@ vshard.router.call(1, 'read', 'echo', {123}) util.check_error(vshard.router.call, 1, 'write', 'echo', {123}) --- - null -- {'type': 'ShardingError', 'code': 7, 'bucket_id': 1} +- {'type': 'ShardingError', 'bucket_id': 1, 'code': 7, 'destination': '<replicaset_1>'} ... test_run:cmd('switch storage_2_a') --- @@ -369,7 +369,7 @@ test_run:cmd('switch storage_1_a') ... box.space._bucket:delete({1}) --- -- [1, 'receiving'] +- [1, 'receiving', '<replicaset_2>'] ... test_run:cmd('switch router_1') --- diff --git a/test/router/router.test.lua b/test/router/router.test.lua index 62d6730..fae8e24 100644 --- a/test/router/router.test.lua +++ b/test/router/router.test.lua @@ -119,9 +119,9 @@ replicaset, err = vshard.router.bucket_discovery(1); return err == nil or err replicaset, err = vshard.router.bucket_discovery(2); return err == nil or err test_run:cmd('switch storage_2_a') -box.space._bucket:replace({1, vshard.consts.BUCKET.SENDING}) +box.space._bucket:replace({1, vshard.consts.BUCKET.SENDING, 'cbf06940-0790-498b-948d-042b62cf3d29'}) test_run:cmd('switch storage_1_a') -box.space._bucket:replace({1, vshard.consts.BUCKET.RECEIVING}) +box.space._bucket:replace({1, vshard.consts.BUCKET.RECEIVING, 'ac522f65-aa94-4134-9f64-51ee384f1a54'}) test_run:cmd('switch router_1') -- Ok to read sending bucket. vshard.router.call(1, 'read', 'echo', {123}) -- 2.14.1
next prev parent reply other threads:[~2018-06-06 15:57 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-06 15:57 [tarantool-patches] [PATCH 0/3][vshard] Add error messages AKhatskevich 2018-06-06 15:57 ` AKhatskevich [this message] 2018-06-06 15:57 ` [tarantool-patches] [PATCH 2/3] Refactor error reporting system AKhatskevich 2018-06-07 12:22 ` [tarantool-patches] " Vladislav Shpilevoy 2018-06-07 16:13 ` Alex Khatskevich 2018-06-06 15:57 ` [tarantool-patches] [PATCH 3/3] Add error messages AKhatskevich 2018-06-07 12:22 ` [tarantool-patches] " Vladislav Shpilevoy 2018-06-07 16:12 ` Alex Khatskevich 2018-06-07 18:44 ` Vladislav Shpilevoy 2018-06-07 12:22 ` [tarantool-patches] Re: [PATCH 0/3][vshard] " Vladislav Shpilevoy 2018-06-07 13:16 ` Alex Khatskevich
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ad97c931820b824e7482100976ebe3114f011260.1528300145.git.avkhatskevich@tarantool.org \ --to=avkhatskevich@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [tarantool-patches] [PATCH 1/3] Fix test on bucket_transferring error' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox