From: Sage Weil <sage@redhat.com>
Date: Thu, 28 Jan 2016 16:00:42 +0000 (-0500)
Subject: rados: make rados bench metadata backward compatible
X-Git-Tag: v10.0.4~107^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b8c04447a51b9103560cadce2839e8a54bea55c;p=ceph.git

rados: make rados bench metadata backward compatible

We recently made a distinction between op size and object size, and broke
our ability to read metadata from old runs.  Change our format to be
backward compatible.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc
index a77febc6cb8..b8d8ffeb76f 100644
--- a/src/common/obj_bencher.cc
+++ b/src/common/obj_bencher.cc
@@ -347,9 +347,13 @@ int ObjBencher::fetch_bench_metadata(const std::string& metadata_file,
   }
   bufferlist::iterator p = object_data.begin();
   ::decode(*object_size, p);
-  ::decode(*op_size, p);
   ::decode(*num_objects, p);
   ::decode(*prevPid, p);
+  if (!p.end()) {
+    ::decode(*op_size, p);
+  } else {
+    *op_size = *object_size;
+  }
 
   return 0;
 }
@@ -579,10 +583,10 @@ int ObjBencher::write_bench(int secondsToRun,
   }
   //write object size/number data for read benchmarks
   ::encode(data.object_size, b_write);
-  ::encode(data.op_size, b_write);
   num_objects = (data.finished + writes_per_object - 1) / writes_per_object;
   ::encode(num_objects, b_write);
   ::encode(getpid(), b_write);
+  ::encode(data.op_size, b_write);
 
   // persist meta-data for further cleanup or read
   sync_write(run_name_meta, b_write, sizeof(int)*3);