From 8f40e2cdf7880f8d8642a0181ae543a38d5ec0e1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 6 Feb 2020 17:34:18 -0600 Subject: [PATCH] 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 --- src/osd/PrimaryLogPG.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index ae776a772b59c..8e5b0c2dea93f 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(), -- 2.39.5