common: pacific release constants

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/doc/dev/release-kickoff-checklist.rst b/doc/dev/release-kickoff-checklist.rst
index 8187d4fa55dc092b062d29e66f21d01416dd730e..cee1c80b9ad4e64aaa8cec4baa2e52f71257ccbf 100644 (file)
--- a/doc/dev/release-kickoff-checklist.rst
+++ b/doc/dev/release-kickoff-checklist.rst
@@ -20,9 +20,9 @@ Define release names and constants
 
 Make sure X (and, ideally, X+1) is defined:
 
-- [ ] src/common/ceph_releases.h (ceph_release_t)
-- [ ] src/common/ceph_strings.cc (ceph_release_name())
-- [ ] src/include/rados.h (CEPH_RELEASE_* and MAX)
+- [x] src/common/ceph_releases.h (ceph_release_t)
+- [x] src/common/ceph_strings.cc (ceph_release_name())
+- [x] src/include/rados.h (CEPH_RELEASE_* and MAX)
 - [ ] src/mon/mon_types.h (ceph::features::mon::FEATURE_* and related structs and helpers; note that monmaptool CLI test output will need adjustment)
 
 Scripts

diff --git a/src/common/ceph_releases.h b/src/common/ceph_releases.h
index 93ee3c02d8be53a561b44be725a76e4644697da4..96fba92fddd01553e95b502d845362b7b167a08f 100644 (file)
--- a/src/common/ceph_releases.h
+++ b/src/common/ceph_releases.h
@@ -27,6 +27,7 @@ enum class ceph_release_t : std::uint8_t {
   mimic,
   nautilus,
   octopus,
+  pacific,
   max,
 };
 

diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc
index dfb02881273810c39416722e0d907ac1753beec6..48148a5b78f44e56329d494b739102402fbe4ea8 100644 (file)
--- a/src/common/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -106,6 +106,8 @@ const char *ceph_release_name(int r)
                return "nautilus";
        case CEPH_RELEASE_OCTOPUS:
                return "octopus";
+       case CEPH_RELEASE_PACIFIC:
+               return "pacific";
        default:
                if (r < 0)
                        return "unspecified";

diff --git a/src/include/rados.h b/src/include/rados.h
index acd8cdc59bb324c628ed2f035af6ce85d4a6f436..9cf6d6289863d704900562974b3925f12498329a 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -201,7 +201,8 @@ extern const char *ceph_osd_state_name(int s);
 #define CEPH_RELEASE_MIMIC      13
 #define CEPH_RELEASE_NAUTILUS   14
 #define CEPH_RELEASE_OCTOPUS    15
-#define CEPH_RELEASE_MAX        16  /* highest + 1 */
+#define CEPH_RELEASE_PACIFIC    16
+#define CEPH_RELEASE_MAX        17  /* highest + 1 */
 
 /*
  * The error code to return when an OSD can't handle a write