From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp44.i.mail.ru (smtp44.i.mail.ru [94.100.177.104]) (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 10CFD469719 for ; Mon, 16 Mar 2020 18:25:24 +0300 (MSK) From: "Timur Safin" Date: Mon, 16 Mar 2020 18:25:22 +0300 Message-ID: <18ca01d5fba7$1c19a2d0$544ce870$@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Content-Language: ru Sender: t.safin@corp.mail.ru Subject: [Tarantool-patches] [PATCH] evio: workaround for wsl1 so_linger assertion List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy , Cyrill Gorcunov Cc: tarantool-patches@dev.tarantool.org SO_LINGER makes no much sense for unix-sockets, and Microsoft WSL is returning EINVAL if setsockopts called for SO_LINGER over unix sockets: [004] 2020-03-11 18:42:29.592 [29182] main/102/app sio.c:169 !> = SystemError setsockopt(SO_LINGER), called on fd 16, aka [004] 2020-03-11 18:42:29.592 [29182] main/102/app F> can't initialize = storage: setsockopt(SO_LINGER), called on fd 16, [004] 2020-03-11 18:42:29.592 [29182] main/102/app F> can't initialize = storage: setsockopt(SO_LINGER), called on fd 16, And it's sort of correct here, but the problem is Linux is simply silently ignoring it, which passes tests. After much debates we decided to work-around this case via CMAKE define. NB! In a future (April/May 2020), when WSL2 with full Linux kernel would be released we should disable this check. --- This patch replaces prior one tsafin/gh-4659-wsl-no-linger-assert = because original approach considered unsafe, and we rather want to workaround it via = CMake instead. Branch: = https://github.com/tarantool/tarantool/tree/tsafin/wsl1-no-linger-assert cmake/os.cmake | 13 +++++++++++++ src/lib/core/evio.c | 2 ++ 2 files changed, 15 insertions(+) diff --git a/cmake/os.cmake b/cmake/os.cmake index 0ed554b9b..ee8870d21 100644 --- a/cmake/os.cmake +++ b/cmake/os.cmake @@ -11,6 +11,15 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") # (see man page for feature_test_macros). add_definitions("-D_FILE_OFFSET_BITS=3D64") find_package_message(PLATFORM "Building for Linux" = "${CMAKE_SYSTEM_NAME}") + + # There are some subtle differences in Linux kernel calls + # implementation under WSL1 (which should go away with WSL2 kernel) + # so for a moment we introduce a way to distinguish Linux and + # Microsoft/WSL1 + if (${CMAKE_SYSTEM} MATCHES "Linux-.*-Microsoft") + add_definitions("-DTARANTOOL_WSL_WORKAROUND_ENABLED=3D1") + endif() + elseif (${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") set(TARGET_OS_FREEBSD 1) set(TARGET_OS_DEBIAN_FREEBSD 1) @@ -19,6 +28,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") add_definitions("-D_FILE_OFFSET_BITS=3D64") find_package_message(PLATFORM "Building for Debian/kFreeBSD" "${CMAKE_SYSTEM_NAME}") + elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") set(TARGET_OS_FREEBSD 1) find_package_message(PLATFORM "Building for FreeBSD" = "${CMAKE_SYSTEM_NAME}") @@ -57,9 +67,11 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") "system libraries is not supported") endif() unset(REAL_OPENSSL_ROOT_DIR) + elseif (${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD") set(TARGET_OS_NETBSD 1) find_package_message(PLATFORM "Building for NetBSD" = "${CMAKE_SYSTEM_NAME}") + elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") set(TARGET_OS_DARWIN 1) =20 @@ -154,6 +166,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") endif() endif() endif() + else() message (FATAL_ERROR "Unsupported platform -- = ${CMAKE_SYSTEM_NAME}") endif() diff --git a/src/lib/core/evio.c b/src/lib/core/evio.c index 2152c15e6..6793236da 100644 --- a/src/lib/core/evio.c +++ b/src/lib/core/evio.c @@ -140,6 +140,7 @@ evio_setsockopt_server(int fd, int family, int type) &on, sizeof(on))) return -1; =20 +#ifndef TARANTOOL_WSL_WORKAROUND_ENABLED /* Send all buffered messages on socket before take * control out from close(2) or shutdown(2). */ struct linger linger =3D { 0, 0 }; @@ -147,6 +148,7 @@ evio_setsockopt_server(int fd, int family, int type) if (sio_setsockopt(fd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger))) return -1; +#endif if (type =3D=3D SOCK_STREAM && family !=3D AF_UNIX && evio_setsockopt_keepalive(fd) !=3D 0) return -1; --=20 2.20.1