From: Sage Weil <sage@redhat.com>
Date: Mon, 10 Sep 2018 17:52:17 +0000 (-0500)
Subject: ceph-objectstore-tool: drop support for ancient export files
X-Git-Tag: v14.0.1~211^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=402f49046cf88b04b7b49f367ff05674346dc718;p=ceph.git

ceph-objectstore-tool: drop support for ancient export files

We've been including the OSDMap for years.

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

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 85526a1aa672..638908b1a3b7 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -1406,17 +1406,11 @@ int get_pg_metadata(ObjectStore *store, bufferlist &bl, metadata_section &ms,
     return -EINVAL;
   }
 
-  // Old exports didn't include OSDMap, see if we have a copy locally
+  // Old exports didn't include OSDMap
   if (ms.osdmap.get_epoch() == 0) {
-    OSDMap findmap;
-    bufferlist findmap_bl;
-    int ret = get_osdmap(store, ms.map_epoch, findmap, findmap_bl);
-    if (ret == 0) {
-      ms.osdmap.deepish_copy_from(findmap);
-    } else {
-      cerr << "WARNING: No OSDMap in old export,"
-           " some objects may be ignored due to a split" << std::endl;
-    }
+    cerr << "WARNING: No OSDMap in old export, this is an ancient export."
+      " Not supported." << std::endl;
+    return -EINVAL;
   }
   if (ms.osdmap.get_epoch() < sb.oldest_map) {
     cerr << "PG export's map " << ms.osdmap.get_epoch()
@@ -1427,12 +1421,7 @@ int get_pg_metadata(ObjectStore *store, bufferlist &bl, metadata_section &ms,
       return -EINVAL;
     }
   }
-
-  // Make sure old_pg_num is 0 in the unusual case that OSDMap not in export
-  // nor can we find a local copy.
-  unsigned old_pg_num = 0;
-  if (ms.osdmap.get_epoch() != 0)
-    old_pg_num = ms.osdmap.get_pg_num(pgid.pgid.pool());
+  unsigned old_pg_num = ms.osdmap.get_pg_num(pgid.pgid.pool());
 
   if (debug) {
     cerr << "old_pg_num " << old_pg_num << std::endl;