From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 18AD3430407 for ; Fri, 14 Aug 2020 13:46:57 +0300 (MSK) From: Ilya Kosarev Date: Fri, 14 Aug 2020 13:46:55 +0300 Message-Id: <20200814104655.6760-1-i.kosarev@tarantool.org> Subject: [Tarantool-patches] [PATCH v2] iproto: close socket explicitly before wal_dir at exit List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: alyapunov@tarantool.org Cc: Ilya Kosarev , tarantool-patches@dev.tarantool.org From: Ilya Kosarev tarantool instance didn't close socket explicitly which could cause hot standby instance to fail to bind in case it tries to bind before socket is closed by OS. Now it is fixed by closing socket explicitly before wal_dir. Closes #3967 --- https://github.com/tarantool/tarantool/tree/i.kosarev/gh-3967-close-socket-explicitly https://github.com/tarantool/tarantool/issues/3967 src/box/box.cc | 1 + src/box/iproto.cc | 13 +++++++++++++ src/box/iproto.h | 3 +++ 3 files changed, 17 insertions(+) diff --git a/src/box/box.cc b/src/box/box.cc index e7ec2891c..73d94f79b 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -1666,6 +1666,7 @@ box_free(void) tuple_free(); port_free(); #endif + iproto_free(); replication_free(); sequence_free(); gc_free(); diff --git a/src/box/iproto.cc b/src/box/iproto.cc index bea35ce87..b1d24910f 100644 --- a/src/box/iproto.cc +++ b/src/box/iproto.cc @@ -2080,3 +2080,16 @@ iproto_set_msg_max(int new_iproto_msg_max) iproto_do_cfg(&cfg_msg); cpipe_set_max_input(&net_pipe, new_iproto_msg_max / 2); } + +void +iproto_free() +{ + tt_pthread_cancel(net_cord.id); + tt_pthread_join(net_cord.id, NULL); + /* + * Close socket descriptor to prevent hot standby instance + * failing to bind in case it tries to bind + * before socket is closed by OS. + */ + close(binary.ev.fd); +} diff --git a/src/box/iproto.h b/src/box/iproto.h index b9a6cf8f7..8f3607ffc 100644 --- a/src/box/iproto.h +++ b/src/box/iproto.h @@ -80,6 +80,9 @@ iproto_listen(const char *uri); void iproto_set_msg_max(int iproto_msg_max); +void +iproto_free(); + #endif /* defined(__cplusplus) */ #endif -- 2.17.1