From 2a22bfedc4fa9f461dc8cfd42c659b9c55ddafca Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 25 Nov 2014 16:56:19 -0800 Subject: [PATCH] ceph_objectstore_tool: Prevent tool from transitioning struct_v on rm-past-intervals Signed-off-by: David Zafman (cherry picked from commit f056bdf93980a0a8e6157dbb124a79389a8f1a3c) --- src/tools/ceph_objectstore_tool.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index 16b463a6387a..94828c086f87 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -2814,6 +2814,14 @@ int main(int argc, char **argv) ObjectStore::Transaction tran; ObjectStore::Transaction *t = &tran; + if (struct_ver != PG::cur_struct_v) { + cerr << "Can't remove past-intervals, version mismatch " << (int)struct_ver + << " (pg) != " << (int)PG::cur_struct_v << " (tool)" + << std::endl; + ret = 1; + goto out; + } + cout << "Remove past-intervals " << past_intervals << std::endl; past_intervals.clear(); -- 2.47.3