Merge pull request redpanda-data#17841 from dotnwat/rpc-new-style

CORE-2347: net: remove dependence on rpc parsing exception type
mmaslankaprv · Apr 13, 2024 · 14e99dc · 14e99dc
2 parents 9fe664f + 42f826c
commit 14e99dc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
@@ -24,7 +24,7 @@ if(LZ4_INCLUDE_DIR AND EXISTS "${LZ4_INCLUDE_DIR}/lz4.h")
     "${LZ4_VERSION_MAJOR}.${LZ4_VERSION_MINOR}.${LZ4_VERSION_RELEASE}")
 endif()
 
-find_library(LZ4_LIBRARY NAMES lz4)
+find_library(LZ4_LIBRARY NAMES liblz4.a)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LZ4

diff --git a/src/v/net/connection.cc b/src/v/net/connection.cc
@@ -11,7 +11,7 @@
 
 #include "base/seastarx.h"
 #include "net/exceptions.h"
-#include "rpc/service.h"
+#include "net/types.h"
 #include "ssx/abort_source.h"
 
 #include <seastar/core/future.hh>
@@ -85,7 +85,7 @@ std::optional<ss::sstring> is_disconnect_exception(std::exception_ptr e) {
         // Happens on unclean client disconnect, when io_iterator_consumer
         // gets fewer bytes than it wanted
         return "short read";
-    } catch (const rpc::rpc_internal_body_parsing_exception&) {
+    } catch (const net::parsing_exception&) {
         // Happens on unclean client disconnect, typically wrapping
         // an out_of_range
         return "parse error";

diff --git a/src/v/net/types.h b/src/v/net/types.h
@@ -32,4 +32,6 @@ class authentication_exception : public std::runtime_error {
       : std::runtime_error(m) {}
 };
 
+class parsing_exception : public std::exception {};
+
 } // namespace net
diff --git a/src/v/rpc/service.h b/src/v/rpc/service.h
@@ -12,6 +12,7 @@
 #pragma once
 
 #include "base/seastarx.h"
+#include "net/types.h"
 #include "reflection/async_adl.h"
 #include "rpc/parse_utils.h"
 #include "rpc/types.h"
@@ -39,7 +40,7 @@ struct service {
     virtual void setup_metrics() = 0;
 };
 
-class rpc_internal_body_parsing_exception : public std::exception {
+class rpc_internal_body_parsing_exception : public net::parsing_exception {
 public:
     explicit rpc_internal_body_parsing_exception(const std::exception_ptr& e)
       : _what(