import 15.2.0 Octopus source

[ceph.git] / ceph / src / crimson / net / Errors.cc

diff --git a/ceph/src/crimson/net/Errors.cc b/ceph/src/crimson/net/Errors.cc
index 62d60ce1c7bd5a42d7039b2a5f7c537461afc24b..d07c090db737a60d275e0c7661cbf797bdc81d43 100644 (file)
--- a/ceph/src/crimson/net/Errors.cc
+++ b/ceph/src/crimson/net/Errors.cc
@@ -14,13 +14,13 @@
 
 #include "Errors.h"
 
-namespace ceph::net {
+namespace crimson::net {
 
 const std::error_category& net_category()
 {
   struct category : public std::error_category {
     const char* name() const noexcept override {
-      return "ceph::net";
+      return "crimson::net";
     }
 
     std::string message(int ev) const override {
@@ -35,73 +35,17 @@ const std::error_category& net_category()
           return "negotiation failure";
         case error::read_eof:
           return "read eof";
-        case error::connection_aborted:
-          return "connection aborted";
-        case error::connection_refused:
-          return "connection refused";
-        case error::connection_reset:
-          return "connection reset";
+        case error::corrupted_message:
+          return "corrupted message";
+        case error::protocol_aborted:
+          return "protocol aborted";
         default:
           return "unknown";
       }
     }
-
-    // unfortunately, seastar throws connection errors with the system category,
-    // rather than the generic category that would match their counterparts
-    // in std::errc. we add our own errors for them, so we can match either
-    std::error_condition default_error_condition(int ev) const noexcept override {
-      switch (static_cast<error>(ev)) {
-        case error::connection_aborted:
-          return std::errc::connection_aborted;
-        case error::connection_refused:
-          return std::errc::connection_refused;
-        case error::connection_reset:
-          return std::errc::connection_reset;
-        default:
-          return std::error_condition(ev, *this);
-      }
-    }
-
-    bool equivalent(int code, const std::error_condition& cond) const noexcept override {
-      if (error_category::equivalent(code, cond)) {
-        return true;
-      }
-      switch (static_cast<error>(code)) {
-        case error::connection_aborted:
-          return cond == std::errc::connection_aborted
-              || cond == std::error_condition(ECONNABORTED, std::system_category());
-        case error::connection_refused:
-          return cond == std::errc::connection_refused
-              || cond == std::error_condition(ECONNREFUSED, std::system_category());
-        case error::connection_reset:
-          return cond == std::errc::connection_reset
-              || cond == std::error_condition(ECONNRESET, std::system_category());
-        default:
-          return false;
-      }
-    }
-
-    bool equivalent(const std::error_code& code, int cond) const noexcept override {
-      if (error_category::equivalent(code, cond)) {
-        return true;
-      }
-      switch (static_cast<error>(cond)) {
-        case error::connection_aborted:
-          return code == std::errc::connection_aborted
-              || code == std::error_code(ECONNABORTED, std::system_category());
-        case error::connection_refused:
-          return code == std::errc::connection_refused
-              || code == std::error_code(ECONNREFUSED, std::system_category());
-        case error::connection_reset:
-          return code == std::errc::connection_reset
-              || code == std::error_code(ECONNRESET, std::system_category());
-        default:
-          return false;
-      }
-    }
   };
   static category instance;
   return instance;
 }
 
-} // namespace ceph::net
+} // namespace crimson::net