From 66a9bfdb32a5a3d82c2edf60db713f4fec9c24ae Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 21 Sep 2015 15:42:52 -0700 Subject: [PATCH] osd/: remove unused pg_hit_set_history_t::current_last_stamp Signed-off-by: Samuel Just --- src/osd/ReplicatedPG.cc | 1 - src/osd/osd_types.cc | 12 ++++++++---- src/osd/osd_types.h | 1 - 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 5ce65562d5d36..439c355eb1440 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -10972,7 +10972,6 @@ void ReplicatedPG::hit_set_persist() updated_hit_set_hist.history.push_back(updated_hit_set_hist.current_info); hit_set_create(); updated_hit_set_hist.current_info = pg_hit_set_info_t(pool.info.use_gmt_hitset); - updated_hit_set_hist.current_last_stamp = utime_t(); // fabricate an object_info_t and SnapSet obc->obs.oi.version = ctx->at_version; diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index a675d5640759a..e33acc08e82a4 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -4000,7 +4000,10 @@ void pg_hit_set_history_t::encode(bufferlist& bl) const { ENCODE_START(1, 1, bl); ::encode(current_last_update, bl); - ::encode(current_last_stamp, bl); + { + utime_t dummy_stamp; + ::encode(dummy_stamp, bl); + } ::encode(current_info, bl); ::encode(history, bl); ENCODE_FINISH(bl); @@ -4010,7 +4013,10 @@ void pg_hit_set_history_t::decode(bufferlist::iterator& p) { DECODE_START(1, p); ::decode(current_last_update, p); - ::decode(current_last_stamp, p); + { + utime_t dummy_stamp; + ::decode(dummy_stamp, p); + } ::decode(current_info, p); ::decode(history, p); DECODE_FINISH(p); @@ -4019,7 +4025,6 @@ void pg_hit_set_history_t::decode(bufferlist::iterator& p) void pg_hit_set_history_t::dump(Formatter *f) const { f->dump_stream("current_last_update") << current_last_update; - f->dump_stream("current_last_stamp") << current_last_stamp; f->open_object_section("current_info"); current_info.dump(f); f->close_section(); @@ -4038,7 +4043,6 @@ void pg_hit_set_history_t::generate_test_instances(list& ls.push_back(new pg_hit_set_history_t); ls.push_back(new pg_hit_set_history_t); ls.back()->current_last_update = eversion_t(1, 2); - ls.back()->current_last_stamp = utime_t(100, 123); ls.back()->current_info.begin = utime_t(2, 4); ls.back()->current_info.end = utime_t(62, 24); ls.back()->history.push_back(ls.back()->current_info); diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index baace7c396ce2..832d8d07996de 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -1740,7 +1740,6 @@ WRITE_CLASS_ENCODER(pg_hit_set_info_t) */ struct pg_hit_set_history_t { eversion_t current_last_update; ///< last version inserted into current set - utime_t current_last_stamp; ///< timestamp of last insert pg_hit_set_info_t current_info; ///< metadata about the current set list history; ///< archived sets, sorted oldest -> newest -- 2.39.5