From: Kirill Yukhin <kyukhin@tarantool.org>
To: tarantool-patches@freelists.org
Cc: vdavydov@tarantool.org, georgy@tarantool.org, kostja@tarantool.org
Subject: Re: [tarantool-patches] [PATCH 2/2] replication: display downstream status at upstream
Date: Tue, 22 May 2018 10:07:16 +0300 [thread overview]
Message-ID: <20180522070716.fnrhrzkmnmedaspe@tarantool.org> (raw)
In-Reply-To: <f29caa46d2b2d00e2e24fe972fad275244a84ac9.1526921933.git.k.belyavskiy@tarantool.org>
Hello Kostya,
On 21 мая 20:07, Konstantin Belyavskiy wrote:
> This fix improves 'box.info.replication' output.
> If downstream fails and thus disconnects from upstream, improve
> logging by printing 'status: disconnected' and error message on
> both sides (master and replica).
>
> Closes #3365
> ---
> diff --git a/src/box/lua/info.c b/src/box/lua/info.c
> index 9dbc3f92c..8f358d04e 100644
> --- a/src/box/lua/info.c
> +++ b/src/box/lua/info.c
> @@ -148,6 +148,23 @@ lbox_pushreplica(lua_State *L, struct replica *replica)
> if (relay_get_state(replica->relay) == RELAY_FOLLOW) {
> lua_pushstring(L, "downstream");
> lbox_pushrelay(L, relay);
> + lua_settable(L, -3);
> + } else if (relay_get_state(replica->relay) == RELAY_STOPPED) {
> + lua_pushstring(L, "downstream");
> +
> + lua_newtable(L);
> + lua_pushstring(L, "status");
> + lua_pushstring(L, "stopped");
> + lua_settable(L, -3);
> +
> + assert(replica->relay);
Few lines above you dereferenced replica (in if-stmt). Why this assert?
If it is necessary, please note that relay is a pointer and should be compared
against NULL according to coding style.
--
Regards, Kirill Yukhin
next prev parent reply other threads:[~2018-05-22 7:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-21 17:07 [PATCH 0/2] replication: improve logging Konstantin Belyavskiy
2018-05-21 17:07 ` [PATCH 1/2] replication: do not delete relay on applier disconnect Konstantin Belyavskiy
2018-05-21 18:50 ` Konstantin Osipov
2018-05-21 17:07 ` [PATCH 2/2] replication: display downstream status at upstream Konstantin Belyavskiy
2018-05-22 7:07 ` Kirill Yukhin [this message]
2018-05-22 10:44 ` [tarantool-patches] Re: [tarantool-patches] " Konstantin Belyavskiy
2018-05-22 11:24 ` Kirill Yukhin
2018-05-29 16:44 ` Konstantin Osipov
2018-05-22 7:08 ` [tarantool-patches] [PATCH 0/2] replication: improve logging Kirill Yukhin
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=20180522070716.fnrhrzkmnmedaspe@tarantool.org \
--to=kyukhin@tarantool.org \
--cc=georgy@tarantool.org \
--cc=kostja@tarantool.org \
--cc=tarantool-patches@freelists.org \
--cc=vdavydov@tarantool.org \
--subject='Re: [tarantool-patches] [PATCH 2/2] replication: display downstream status at upstream' \
/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