From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Feb 2020 23:34:18 +0000 (-0600)
Subject: osd/PrimaryLogPG: use legacy timestamp rendering for hit_set objects
X-Git-Tag: v15.1.1~494^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f40e2cdf7880f8d8642a0181ae543a38d5ec0e1;p=ceph.git

osd/PrimaryLogPG: use legacy timestamp rendering for hit_set objects

These objects exist prior to octopus and we need to be consistent with
the naming.  Stick with the legacy form.

Fixes: https://tracker.ceph.com/issues/44024
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index ae776a772b59..8e5b0c2dea93 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -13538,11 +13538,11 @@ hobject_t PrimaryLogPG::get_hit_set_archive_object(utime_t start,
   ostringstream ss;
   ss << "hit_set_" << info.pgid.pgid << "_archive_";
   if (using_gmt) {
-    start.gmtime(ss) << "_";
-    end.gmtime(ss);
+    start.gmtime(ss, true /* legacy pre-octopus form */) << "_";
+    end.gmtime(ss, true /* legacy pre-octopus form */);
   } else {
-    start.localtime(ss) << "_";
-    end.localtime(ss);
+    start.localtime(ss, true /* legacy pre-octopus form */) << "_";
+    end.localtime(ss, true /* legacy pre-octopus form */);
   }
   hobject_t hoid(sobject_t(ss.str(), CEPH_NOSNAP), "",
 		 info.pgid.ps(), info.pgid.pool(),