update sources to v12.1.3

[ceph.git] / ceph / src / ceph_osd.cc

diff --git a/ceph/src/ceph_osd.cc b/ceph/src/ceph_osd.cc
index f3d585b47759a4d18b0c2600987edca7424d8ac8..d7e54a3a3faf5d8938d9444c4ee89c74bbe5a6f3 100644 (file)
--- a/ceph/src/ceph_osd.cc
+++ b/ceph/src/ceph_osd.cc
@@ -246,6 +246,7 @@ int main(int argc, const char **argv)
       bl.read_fd(fd, 64);
       if (bl.length()) {
        store_type = string(bl.c_str(), bl.length() - 1);  // drop \n
+       g_conf->set_val("osd_objectstore", store_type);
        dout(5) << "object store type is " << store_type << dendl;
       }
       ::close(fd);
@@ -333,28 +334,28 @@ int main(int argc, const char **argv)
   }
   if (check_wants_journal) {
     if (store->wants_journal()) {
-      cout << "yes" << std::endl;
+      cout << "wants journal: yes" << std::endl;
       exit(0);
     } else {
-      cout << "no" << std::endl;
+      cout << "wants journal: no" << std::endl;
       exit(1);
     }
   }
   if (check_allows_journal) {
     if (store->allows_journal()) {
-      cout << "yes" << std::endl;
+      cout << "allows journal: yes" << std::endl;
       exit(0);
     } else {
-      cout << "no" << std::endl;
+      cout << "allows journal: no" << std::endl;
       exit(1);
     }
   }
   if (check_needs_journal) {
     if (store->needs_journal()) {
-      cout << "yes" << std::endl;
+      cout << "needs journal: yes" << std::endl;
       exit(0);
     } else {
-      cout << "no" << std::endl;
+      cout << "needs journal: no" << std::endl;
       exit(1);
     }
   }