From 406f223024408f2a5806c025d070e6c3817f0739 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Tue, 30 Apr 2019 12:28:07 -0400 Subject: [PATCH] osd: Add error_category for OSD result codes Actually to be used by /clients/. Signed-off-by: Adam C. Emerson --- src/CMakeLists.txt | 1 + src/osd/error_code.cc | 105 ++++++++++++++++++++++++++++++++++++++++++ src/osd/error_code.h | 53 +++++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 src/osd/error_code.cc create mode 100644 src/osd/error_code.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d7cb95b171fb9..5dbe424b504a0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -336,6 +336,7 @@ set(libcommon_files osd/OSDMap.cc osd/OSDMapMapping.cc osd/osd_types.cc + osd/error_code.cc osd/PGPeeringEvent.cc osd/OpRequest.cc osd/ClassHandler.cc diff --git a/src/osd/error_code.cc b/src/osd/error_code.cc new file mode 100644 index 0000000000000..96a171ec766f9 --- /dev/null +++ b/src/osd/error_code.cc @@ -0,0 +1,105 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2019 Red Hat + * Author: Adam C. Emerson + * + * This is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software + * Foundation. See file COPYING. + * + */ + +#include + +#include "common/error_code.h" +#include "common/errno.h" +#include "error_code.h" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +class osd_error_category : public ceph::converting_category { +public: + osd_error_category(){} + const char* name() const noexcept override; + const char* message(int ev, char*, std::size_t) const noexcept override; + std::string message(int ev) const override; + boost::system::error_condition default_error_condition(int ev) const noexcept + override; + bool equivalent(int ev, const boost::system::error_condition& c) const + noexcept override; + using ceph::converting_category::equivalent; + int from_code(int ev) const noexcept override; +}; +#pragma GCC diagnostic pop +#pragma clang diagnostic pop + +const char* osd_error_category::name() const noexcept { + return "osd"; +} + +const char* osd_error_category::message(int ev, char* buf, + std::size_t len) const noexcept { + if (ev == 0) + return "No error"; + + switch (static_cast(ev)) { + case osd_errc::old_snapc: + return "ORDERSNAP flag set; writer has old snapc"; + case osd_errc::blacklisted: + return "Blacklisted"; + } + + if (len) { + auto s = cpp_strerror(ev); + auto n = s.copy(buf, len - 1); + *(buf + n) = '\0'; + } + return buf; +} + +std::string osd_error_category::message(int ev) const { + if (ev == 0) + return "No error"; + + switch (static_cast(ev)) { + case osd_errc::old_snapc: + return "ORDERSNAP flag set; writer has old snapc"; + case osd_errc::blacklisted: + return "Blacklisted"; + } + + return cpp_strerror(ev); +} + +boost::system::error_condition osd_error_category::default_error_condition(int ev) const noexcept { + if (ev == static_cast(osd_errc::old_snapc) || + ev == static_cast(osd_errc::blacklisted)) + return { ev, *this }; + else + return { ev, boost::system::generic_category() }; +} + +bool osd_error_category::equivalent(int ev, const boost::system::error_condition& c) const noexcept { + switch (static_cast(ev)) { + case osd_errc::old_snapc: + return c == boost::system::errc::invalid_argument; + case osd_errc::blacklisted: + return c == boost::system::errc::operation_not_permitted; + } + return default_error_condition(ev) == c; +} + +int osd_error_category::from_code(int ev) const noexcept { + return -ev; +} + +const boost::system::error_category& osd_category() noexcept { + static const osd_error_category c; + return c; +} diff --git a/src/osd/error_code.h b/src/osd/error_code.h new file mode 100644 index 0000000000000..ae112de2f0cfc --- /dev/null +++ b/src/osd/error_code.h @@ -0,0 +1,53 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2019 Red Hat + * Author: Adam C. Emerson + * + * This is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software + * Foundation. See file COPYING. + * + */ + +#pragma once + +#include + +#include "include/rados.h" + +const boost::system::error_category& osd_category() noexcept; + +// Since the OSD mostly uses POSIX error codes plus a couple +// additions, this will be a degenerate error category for now that +// mostly forwards to POSIX. + +enum class osd_errc { + old_snapc = 85, /* ORDERSNAP flag set; writer has old snapc*/ + blacklisted = 108 /* blacklisted */ +}; + +namespace boost::system { +template<> +struct is_error_code_enum<::osd_errc> { + static const bool value = true; +}; + +template<> +struct is_error_condition_enum<::osd_errc> { + static const bool value = false; +}; +} + +// implicit conversion: +inline boost::system::error_code make_error_code(osd_errc e) noexcept { + return { static_cast(e), osd_category() }; +} + +// explicit conversion: +inline boost::system::error_condition make_error_condition(osd_errc e) noexcept { + return { static_cast(e), osd_category() }; +} -- 2.39.5