<HTML><BODY>Hi,<br>Overall patch looks good with minor complains:<br>- unused header.<br><br><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Четверг, 14 июня 2018, 18:04 +03:00 от Ilya Markov <imarkov@tarantool.org>:<br><br><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15289886910000000288_BODY">Add event: replica fails with some error.<br><br>
In scope of #3159<br>
---<br>
src/box/ctl.h | 1 +<br>
src/box/lua/ctl.c | 6 +++++-<br>
src/box/relay.cc | 7 +++++++<br>
test/replication/master_onctl.lua | 3 +++<br>
test/replication/onctl.result | 12 ++++++++++++<br>
test/replication/onctl.test.lua | 5 ++++-<br>
6 files changed, 32 insertions(+), 2 deletions(-)<br><br>
diff --git a/src/box/ctl.h b/src/box/ctl.h<br>
index 1dbb6be..db6f08a 100644<br>
--- a/src/box/ctl.h<br>
+++ b/src/box/ctl.h<br>
@@ -49,6 +49,7 @@ enum ctl_event_type {<br>
CTL_EVENT_SHUTDOWN,<br>
CTL_EVENT_REPLICASET_ADD,<br>
CTL_EVENT_REPLICASET_REMOVE,<br>
+ CTL_EVENT_REPLICA_CONNECTION_ERROR,<br>
};<br><br>
struct on_ctl_event_ctx {<br>
diff --git a/src/box/lua/ctl.c b/src/box/lua/ctl.c<br>
index 5bd9be3..8a0dfc2 100644<br>
--- a/src/box/lua/ctl.c<br>
+++ b/src/box/lua/ctl.c<br>
@@ -37,6 +37,7 @@<br>
#include <lualib.h><br>
#include <lua/trigger.h><br>
#include <box/ctl.h></div></div></div></div></blockquote><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15289886910000000288_BODY"><br>
+#include <tt_uuid.h></div></div></div></div></blockquote>Please remove it, since it's unused.<br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15289886910000000288_BODY"><br><br>
#include "lua/utils.h"<br><br>
@@ -77,7 +78,8 @@ lbox_push_on_ctl_event(struct lua_State *L, void *event)<br>
lua_settable(L, -3);<br><br>
if (ctx->type == CTL_EVENT_REPLICASET_ADD ||<br>
- ctx->type == CTL_EVENT_REPLICASET_REMOVE) {<br>
+ ctx->type == CTL_EVENT_REPLICASET_REMOVE ||<br>
+ ctx->type == CTL_EVENT_REPLICA_CONNECTION_ERROR) {<br>
lua_pushstring(L, "replica_id");<br>
luaL_pushuint64(L, ctx->replica_id);<br>
lua_settable(L, -3);<br>
@@ -125,5 +127,7 @@ box_lua_ctl_init(struct lua_State *L)<br>
lua_setfield(L, -2, "REPLICASET_ADD");<br>
lua_pushnumber(L, CTL_EVENT_REPLICASET_REMOVE);<br>
lua_setfield(L, -2, "REPLICASET_REMOVE");<br>
+ lua_pushnumber(L, CTL_EVENT_REPLICA_CONNECTION_ERROR);<br>
+ lua_setfield(L, -2, "REPLICA_CONNECTION_ERROR");<br>
lua_pop(L, 2); /* box, ctl */<br>
}<br>
diff --git a/src/box/relay.cc b/src/box/relay.cc<br>
index a25cc54..d535f83 100644<br>
--- a/src/box/relay.cc<br>
+++ b/src/box/relay.cc<br>
@@ -52,6 +52,7 @@<br>
#include "xrow_io.h"<br>
#include "xstream.h"<br>
#include "wal.h"<br>
+#include "ctl.h"<br><br>
/**<br>
* Cbus message to send status updates from relay to tx thread.<br>
@@ -548,6 +549,12 @@ relay_subscribe_f(va_list ap)<br>
if (!diag_is_empty(&relay->diag)) {<br>
/* An error has occurred while reading ACKs of xlog. */<br>
diag_move(&relay->diag, diag_get());<br>
+ struct on_ctl_event_ctx ctx;<br>
+ ctx.type = CTL_EVENT_REPLICA_CONNECTION_ERROR;<br>
+ ctx.replica_id = relay->replica->id;<br>
+ if (run_on_ctl_event_triggers(&ctx) < 0)<br>
+ say_error("ctl_trigger error in replica error: %s",<br>
+ diag_last_error(diag_get())->errmsg);<br>
/* Reference the diag in the status. */<br>
diag_add_error(&relay->diag, diag_last_error(diag_get()));<br>
}<br>
diff --git a/test/replication/master_onctl.lua b/test/replication/master_onctl.lua<br>
index e0eb39a..355e791 100644<br>
--- a/test/replication/master_onctl.lua<br>
+++ b/test/replication/master_onctl.lua<br>
@@ -7,6 +7,7 @@ READ_ONLY = 0<br>
READ_WRITE = 0<br>
REPLICASET_ADD = {}<br>
REPLICASET_REMOVE = {}<br>
+REPLICA_CONNECTION_ERROR = {}<br><br>
local function onctl(ctx)<br>
if ctx.type == box.ctl.event.SYSTEM_SPACE_RECOVERY then<br>
@@ -21,6 +22,8 @@ local function onctl(ctx)<br>
table.insert(REPLICASET_ADD, ctx.replica_id)<br>
elseif ctx.type == box.ctl.event.REPLICASET_REMOVE then<br>
table.insert(REPLICASET_REMOVE, ctx.replica_id)<br>
+ elseif ctx.type == box.ctl.event.REPLICA_CONNECTION_ERROR then<br>
+ table.insert(REPLICA_CONNECTION_ERROR, ctx.replica_id)<br>
end<br>
end<br><br>
diff --git a/test/replication/onctl.result b/test/replication/onctl.result<br>
index 19b3e67..24a6683 100644<br>
--- a/test/replication/onctl.result<br>
+++ b/test/replication/onctl.result<br>
@@ -50,6 +50,10 @@ REPLICASET_REMOVE<br>
---<br>
- - 1<br>
...<br>
+REPLICA_CONNECTION_ERROR<br>
+---<br>
+- []<br>
+...<br>
REPLICASET_ADD = {}<br>
---<br>
...<br>
@@ -94,6 +98,10 @@ REPLICASET_REMOVE<br>
---<br>
- []<br>
...<br>
+REPLICA_CONNECTION_ERROR<br>
+---<br>
+- []<br>
+...<br>
new_replica_id<br>
---<br>
- 2<br>
@@ -186,6 +194,10 @@ test_run:cmd("switch master")<br>
---<br>
- true<br>
...<br>
+REPLICA_CONNECTION_ERROR<br>
+---<br>
+- - 2<br>
+...<br>
box.schema.user.revoke('guest', 'replication')<br>
---<br>
...<br>
diff --git a/test/replication/onctl.test.lua b/test/replication/onctl.test.lua<br>
index ff6a898..352b118 100644<br>
--- a/test/replication/onctl.test.lua<br>
+++ b/test/replication/onctl.test.lua<br>
@@ -16,6 +16,7 @@ READ_WRITE<br>
REPLICASET_ADD<br>
-- must be one entry. Deletion of initial tuple in _cluster space.<br>
REPLICASET_REMOVE<br>
+REPLICA_CONNECTION_ERROR<br><br>
REPLICASET_ADD = {}<br>
REPLICASET_REMOVE = {}<br>
@@ -39,6 +40,7 @@ test_run:cmd("start server replica")<br><br>
REPLICASET_ADD<br>
REPLICASET_REMOVE<br>
+REPLICA_CONNECTION_ERROR<br><br>
new_replica_id<br>
deleted_replica_id<br>
@@ -80,8 +82,9 @@ test_run:cmd("restart server replica")<br>
-- TODO: test SHUTDOWN, when it is possible to grep logs of killed replica.<br>
--test_run:grep_log('replica', 'test replica shutdown')<br><br>
-<br>
test_run:cmd("switch master")<br>
+REPLICA_CONNECTION_ERROR<br>
+<br>
box.schema.user.revoke('guest', 'replication')<br>
_ = box.space._cluster:delete{2}<br><br>
-- <br>
2.7.4<br><br><br></div></div></div></div></blockquote>
<br>
<br>Best regards,<br>Konstantin Belyavskiy<br>k.belyavskiy@tarantool.org<br></BODY></HTML>