From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Vladislav Shpilevoy Subject: [PATCH v3 1/1] iproto: get iproto obuf only right before usage Date: Tue, 20 Mar 2018 16:43:05 +0300 Message-Id: In-Reply-To: <20180320130735.xujvp3pc52d5djsj@esperanza> References: <20180320130735.xujvp3pc52d5djsj@esperanza> To: tarantool-patches@freelists.org Cc: vdavydov.dev@gmail.com, Vladislav Shpilevoy List-ID: It is possible to discard non-sent responses using a special sequence of requests and yields. In details: if DML requests yield on commit too long, there are fast read requests, and a network is saturated, then some non-sent DML responses are discarded. Closes #3255 --- src/box/iproto.cc | 25 +++++++++++++++++++++---- src/errinj.h | 1 + test/box/errinj.result | 46 +++++++++++++++++++++++++++++++++++++++++++++- test/box/errinj.test.lua | 21 +++++++++++++++++++++ 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/src/box/iproto.cc b/src/box/iproto.cc index 37313fa52..db5820806 100644 --- a/src/box/iproto.cc +++ b/src/box/iproto.cc @@ -59,6 +59,7 @@ #include "replication.h" /* instance_uuid */ #include "iproto_constants.h" #include "rmean.h" +#include "errinj.h" /* The number of iproto messages in flight */ enum { IPROTO_MSG_MAX = 768 }; @@ -1163,11 +1164,20 @@ tx_reply_iproto_error(struct cmsg *m) iproto_wpos_create(&msg->wpos, out); } +/** Inject a short delay on tx request processing for testing. */ +static inline void +tx_inject_delay() +{ + ERROR_INJECT(ERRINJ_IPROTO_TX_DELAY, { + if (rand() % 100 < 10) + fiber_sleep(0.001); + }); +} + static void tx_process1(struct cmsg *m) { struct iproto_msg *msg = tx_accept_msg(m); - struct obuf *out = msg->connection->tx.p_obuf; tx_fiber_init(msg->connection->session, msg->header.sync); if (tx_check_schema(msg->header.schema_version)) @@ -1175,8 +1185,12 @@ tx_process1(struct cmsg *m) struct tuple *tuple; struct obuf_svp svp; - if (box_process1(&msg->dml, &tuple) || - iproto_prepare_select(out, &svp)) + struct obuf *out; + tx_inject_delay(); + if (box_process1(&msg->dml, &tuple) != 0) + goto error; + out = msg->connection->tx.p_obuf; + if (iproto_prepare_select(out, &svp) != 0) goto error; if (tuple && tuple_to_obuf(tuple, out)) goto error; @@ -1192,7 +1206,7 @@ static void tx_process_select(struct cmsg *m) { struct iproto_msg *msg = tx_accept_msg(m); - struct obuf *out = msg->connection->tx.p_obuf; + struct obuf *out; struct obuf_svp svp; struct port port; int count; @@ -1204,11 +1218,14 @@ tx_process_select(struct cmsg *m) if (tx_check_schema(msg->header.schema_version)) goto error; + tx_inject_delay(); rc = box_select(req->space_id, req->index_id, req->iterator, req->offset, req->limit, req->key, req->key_end, &port); if (rc < 0) goto error; + + out = msg->connection->tx.p_obuf; if (iproto_prepare_select(out, &svp) != 0) { port_destroy(&port); goto error; diff --git a/src/errinj.h b/src/errinj.h index 352a3c3c9..a5417baf6 100644 --- a/src/errinj.h +++ b/src/errinj.h @@ -107,6 +107,7 @@ struct errinj { _(ERRINJ_RELAY_EXIT_DELAY, ERRINJ_DOUBLE, {.dparam = 0}) \ _(ERRINJ_VY_DELAY_PK_LOOKUP, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_VY_RUN_WRITE_STMT_TIMEOUT, ERRINJ_DOUBLE, {.dparam = 0}) \ + _(ERRINJ_IPROTO_TX_DELAY, ERRINJ_BOOL, {.bparam = false}) \ ENUM0(errinj_id, ERRINJ_LIST); extern struct errinj errinjs[]; diff --git a/test/box/errinj.result b/test/box/errinj.result index db27dd4b3..cd0c35c2f 100644 --- a/test/box/errinj.result +++ b/test/box/errinj.result @@ -60,9 +60,11 @@ errinj.info() state: false ERRINJ_WAL_ROTATE: state: false + ERRINJ_VY_POINT_ITER_WAIT: + state: false ERRINJ_RELAY_EXIT_DELAY: state: 0 - ERRINJ_VY_POINT_ITER_WAIT: + ERRINJ_IPROTO_TX_DELAY: state: false ERRINJ_TUPLE_FIELD: state: false @@ -1057,3 +1059,45 @@ box.error.injection.set('ERRINJ_BUILD_SECONDARY', -1) s:drop() --- ... +-- +-- gh-3255: iproto can crash and discard responses, if a network +-- is saturated, and DML yields too long on commit. +-- +box.schema.user.grant('guest', 'read,write,execute', 'universe') +--- +... +s = box.schema.space.create('test') +--- +... +_ = s:create_index('pk') +--- +... +c = net_box.connect(box.cfg.listen) +--- +... +ch = fiber.channel(200) +--- +... +errinj.set("ERRINJ_IPROTO_TX_DELAY", true) +--- +- ok +... +for i = 1, 100 do fiber.create(function() for j = 1, 10 do c.space.test:replace{1} end ch:put(true) end) end +--- +... +for i = 1, 100 do fiber.create(function() for j = 1, 10 do c.space.test:select() end ch:put(true) end) end +--- +... +for i = 1, 200 do ch:get() end +--- +... +errinj.set("ERRINJ_IPROTO_TX_DELAY", false) +--- +- ok +... +s:drop() +--- +... +box.schema.user.revoke('guest', 'read,write,execute','universe') +--- +... diff --git a/test/box/errinj.test.lua b/test/box/errinj.test.lua index 9bcf53847..3af1b74dc 100644 --- a/test/box/errinj.test.lua +++ b/test/box/errinj.test.lua @@ -348,3 +348,24 @@ box.error.injection.set('ERRINJ_BUILD_SECONDARY', sk.id) sk:alter({parts = {2, 'number'}}) box.error.injection.set('ERRINJ_BUILD_SECONDARY', -1) s:drop() + +-- +-- gh-3255: iproto can crash and discard responses, if a network +-- is saturated, and DML yields too long on commit. +-- + +box.schema.user.grant('guest', 'read,write,execute', 'universe') +s = box.schema.space.create('test') +_ = s:create_index('pk') + +c = net_box.connect(box.cfg.listen) + +ch = fiber.channel(200) +errinj.set("ERRINJ_IPROTO_TX_DELAY", true) +for i = 1, 100 do fiber.create(function() for j = 1, 10 do c.space.test:replace{1} end ch:put(true) end) end +for i = 1, 100 do fiber.create(function() for j = 1, 10 do c.space.test:select() end ch:put(true) end) end +for i = 1, 200 do ch:get() end +errinj.set("ERRINJ_IPROTO_TX_DELAY", false) + +s:drop() +box.schema.user.revoke('guest', 'read,write,execute','universe') -- 2.14.3 (Apple Git-98)