From: Igor Fedotov <ifedotov@suse.com>
Date: Mon, 8 Nov 2021 12:14:46 +0000 (+0300)
Subject: osd: report error and fail if store returns no meta collection
X-Git-Tag: v16.2.15~162^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc0fe263d7da25a1cdebbe1c8bbd698df864172b;p=ceph.git

osd: report error and fail if store returns no meta collection

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 96d7bbd53a394375e468e324001c188c5f6798ca)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c8f87a18bd5c..4085fcbffa99 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3497,6 +3497,10 @@ int OSD::init()
 
   store->set_cache_shards(get_num_cache_shards());
 
+ int rotating_auth_attempts = 0;
+ auto rotating_auth_timeout =
+   g_conf().get_val<int64_t>("rotating_keys_bootstrap_timeout");
+
   int r = store->mount();
   if (r < 0) {
     derr << "OSD:init: unable to mount object store" << dendl;
@@ -3511,7 +3515,12 @@ int OSD::init()
   dout(2) << "boot" << dendl;
 
   service.meta_ch = store->open_collection(coll_t::meta());
-
+  if (!service.meta_ch) {
+    derr << "OSD:init: unable to open meta collection"
+         << dendl;
+    r = -ENOENT;
+    goto out;
+  }
   // initialize the daily loadavg with current 15min loadavg
   double loadavgs[3];
   if (getloadavg(loadavgs, 3) == 3) {
@@ -3521,10 +3530,6 @@ int OSD::init()
     daily_loadavg = 1.0;
   }
 
-  int rotating_auth_attempts = 0;
-  auto rotating_auth_timeout =
-    g_conf().get_val<int64_t>("rotating_keys_bootstrap_timeout");
-
   // sanity check long object name handling
   {
     hobject_t l;