chore: rename

Signed-off-by: Vladislav Oleshko <[email protected]>

Author: dranikpg

src/server/server_family.cc

@@ -2047,20 +2047,20 @@ void ServerFamily::Info(CmdArgList args, ConnectionContext* cntx) {
     append("ram_misses", m.events.ram_misses);
   }
 
-  if (should_enter("TIERED_V2", true)) {
-    append("tiered_v2_total_stashes", m.tiered_stats_v2.total_stashes);
-    append("tiered_v2_total_fetches", m.tiered_stats_v2.total_fetches);
-    append("tiered_v2_total_cancels", m.tiered_stats_v2.total_cancels);
+  if (should_enter("TIERED", true)) {
+    append("tiered_total_stashes", m.tiered_stats_v2.total_stashes);
+    append("tiered_total_fetches", m.tiered_stats_v2.total_fetches);
+    append("tiered_total_cancels", m.tiered_stats_v2.total_cancels);
 
-    append("tiered_v2_allocated_bytes", m.tiered_stats_v2.allocated_bytes);
-    append("tiered_v2_capacity_bytes", m.tiered_stats_v2.capacity_bytes);
+    append("tiered_allocated_bytes", m.tiered_stats_v2.allocated_bytes);
+    append("tiered_capacity_bytes", m.tiered_stats_v2.capacity_bytes);
 
-    append("tiered_v2_pending_read_cnt", m.tiered_stats_v2.pending_read_cnt);
-    append("tiered_v2_pending_stash_cnt", m.tiered_stats_v2.pending_stash_cnt);
+    append("tiered_pending_read_cnt", m.tiered_stats_v2.pending_read_cnt);
+    append("tiered_pending_stash_cnt", m.tiered_stats_v2.pending_stash_cnt);
 
-    append("tiered_v2_small_bins_cnt", m.tiered_stats_v2.small_bins_cnt);
-    append("tiered_v2_small_bins_entries_cnt", m.tiered_stats_v2.small_bins_entries_cnt);
-    append("tiered_v2_small_bins_filling_bytes", m.tiered_stats_v2.small_bins_filling_bytes);
+    append("tiered_small_bins_cnt", m.tiered_stats_v2.small_bins_cnt);
+    append("tiered_small_bins_entries_cnt", m.tiered_stats_v2.small_bins_entries_cnt);
+    append("tiered_small_bins_filling_bytes", m.tiered_stats_v2.small_bins_filling_bytes);
   }
 
   if (should_enter("PERSISTENCE", true)) {

src/server/tiering/op_manager.cc

@@ -89,7 +89,8 @@ void OpManager::ProcessStashed(EntryId id, unsigned version, DiskSegment segment
       it != pending_stash_ver_.end() && it->second == version) {
     pending_stash_ver_.erase(it);
     ReportStashed(id, segment, ec);
-  } else {
+  } else if (!ec) {
+    // Throw away the value because it's no longer up-to-date even if no error occured
     storage_.MarkAsFree(segment);
   }
 }