Merge pull request ceph#1591 from ceph/wip-7915

mon: bump snap_epoch when adding a tier (fixes 7915) Reviewed-by: Samuel Just <[email protected]>
dano · Apr 2, 2014 · eae5a37 · eae5a37
2 parents 27e353c + 6bf46e2
commit eae5a37
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
@@ -4929,6 +4929,7 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m,
       return true;
     }
     np->tiers.insert(tierpool_id);
+    np->set_snap_epoch(pending_inc.epoch); // tier will update to our snap info
     ntp->tier_of = pool_id;
     ss << "pool '" << tierpoolstr << "' is now (or already was) a tier of '" << poolstr << "'";
     wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, ss.str(),
@@ -5176,6 +5177,7 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m,
       return true;
     }
     np->tiers.insert(tierpool_id);
+    np->set_snap_epoch(pending_inc.epoch); // tier will update to our snap info
     ntp->tier_of = pool_id;
     ntp->cache_mode = mode;
     ntp->hit_set_count = g_conf->osd_tier_default_cache_hit_set_count;