From: Kefu Chai <kchai@redhat.com>
Date: Wed, 23 Jan 2019 09:54:24 +0000 (+0800)
Subject: crimson/osd: add operator<< to OSDState
X-Git-Tag: v14.1.0~263^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=05a262d5aa9af8bb89cd91eb79c7fbd0ff532df1;p=ceph-ci.git

crimson/osd: add operator<< to OSDState

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index a0e8a2cb773..d5619f87a51 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -437,7 +437,7 @@ seastar::future<> OSD::committed_osd_maps(version_t first,
         return start_boot();
       }
     } else {
-      logger().info("osd.{}: now ???", whoami);
+      logger().info("osd.{}: now {}", whoami, state);
       // XXX
       return seastar::now();
     }
diff --git a/src/crimson/osd/state.h b/src/crimson/osd/state.h
index 2afd7b00060..4c445348d30 100644
--- a/src/crimson/osd/state.h
+++ b/src/crimson/osd/state.h
@@ -3,6 +3,9 @@
 
 #pragma once
 
+#include <string_view>
+#include <ostream>
+
 class OSDMap;
 
 class OSDState {
@@ -49,7 +52,7 @@ public:
   void set_stopping() {
     state = State::STOPPING;
   }
-  const char* print() {
+  std::string_view to_string() const {
     switch (state) {
     case State::INITIALIZING: return "initializing";
     case State::PREBOOT: return "preboot";
@@ -61,3 +64,8 @@ public:
     }
   }
 };
+
+inline std::ostream&
+operator<<(std::ostream& os, const OSDState& s) {
+  return os << s.to_string();
+}