From 025b78dbe369f2c714f4a1afa01855e83e8fba32 Mon Sep 17 00:00:00 2001 From: Sergey Maslenkov Date: Thu, 12 Sep 2024 12:22:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BF=D0=B0=D1=82=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=20Seastar=20=D0=BF=D0=BE=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=82=D0=B0=D1=86=D0=B8=D0=B8=20=D1=82=D0=B8?= =?UTF-8?q?=D0=BF=D0=BE=D0=B2=20=D0=B8=20=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D1=81=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B5=20UDP-=D0=BF=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=BA=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20Posix-?= =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=BA=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- builder/libs/seastar/src/core/metrics.cc | 2 +- builder/libs/seastar/src/core/scollectd.cc | 2 +- builder/libs/seastar/src/net/posix-stack.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/libs/seastar/src/core/metrics.cc b/builder/libs/seastar/src/core/metrics.cc index 14f1d5a..f782957 100644 --- a/builder/libs/seastar/src/core/metrics.cc +++ b/builder/libs/seastar/src/core/metrics.cc @@ -237,7 +237,7 @@ metric_value metric_value::operator+(const metric_value& c) { } void metric_value::ulong_conversion_error(double d) { - throw std::range_error(format("cannot convert double value {} to unsigned long", d)); + seastar_logger.warn("cannot convert double value {} to unsigned long", d); } metric_definition_impl::metric_definition_impl( diff --git a/builder/libs/seastar/src/core/scollectd.cc b/builder/libs/seastar/src/core/scollectd.cc index 2e44954..6e431c8 100644 --- a/builder/libs/seastar/src/core/scollectd.cc +++ b/builder/libs/seastar/src/core/scollectd.cc @@ -228,7 +228,7 @@ struct cpwriter { } case data_type::COUNTER: case data_type::REAL_COUNTER: - write(v.ui()); // unsigned int 64, big endian + write(v.i()); // int 64, big endian break; default: assert(0); diff --git a/builder/libs/seastar/src/net/posix-stack.cc b/builder/libs/seastar/src/net/posix-stack.cc index 9fd5567..0bb7d2d 100644 --- a/builder/libs/seastar/src/net/posix-stack.cc +++ b/builder/libs/seastar/src/net/posix-stack.cc @@ -815,7 +815,7 @@ class posix_datagram_channel : public datagram_channel_impl { if (is_inet(family)) { fd.setsockopt(SOL_IP, IP_PKTINFO, true); - if (engine().posix_reuseport_available()) { + if (true) { //(engine().posix_reuseport_available()) { fd.setsockopt(SOL_SOCKET, SO_REUSEPORT, 1); } }