]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PrimaryLogPG: use legacy timestamp rendering for hit_set objects
authorSage Weil <sage@redhat.com>
Thu, 6 Feb 2020 23:34:18 +0000 (17:34 -0600)
committerSage Weil <sage@redhat.com>
Fri, 7 Feb 2020 22:44:18 +0000 (16:44 -0600)
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>
src/osd/PrimaryLogPG.cc

index ae776a772b59cef40e94aed774018057938ed8aa..8e5b0c2dea93fe25a7bba8919228b40ad8d1face 100644 (file)
@@ -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(),