]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test/fio_ceph_objectstore: fix fio plugin build failure by engine_data 15044/head
authorlisali <xiaoyan.li@intel.com>
Thu, 11 May 2017 14:44:43 +0000 (10:44 -0400)
committerlisali <xiaoyan.li@intel.com>
Thu, 11 May 2017 14:44:43 +0000 (10:44 -0400)
The commit in fio https://github.com/axboe/fio/commit/710bf9c592b849935e1bcc56ffc805fa1d5f9365
changed engine_data to a union which leads build of fio_ceph_objectstore failed.

Signed-off-by: Lisa Li xiaoyan.li@intel.com
src/test/fio/fio_ceph_objectstore.cc

index c2ac742a9aa2b198004578e1ebafef3febcdb595..c2be0d28d0cde9a3b94413e7a96054881a7c2729 100644 (file)
@@ -209,7 +209,7 @@ Job::Job(Engine* engine, const thread_data* td)
   for (uint32_t i = 0; i < td->o.nr_files; i++) {
     auto f = td->files[i];
     f->real_file_size = file_size;
-    f->engine_data = i;
+    f->engine_pos = i;
 
     // associate each object with a collection in a round-robin fashion
     auto& coll = collections[i % collections.size()];
@@ -329,7 +329,7 @@ int fio_ceph_os_queue(thread_data* td, io_u* u)
   fio_ro_check(td, u);
 
   auto job = static_cast<Job*>(td->io_ops_data);
-  auto& object = job->objects[u->file->engine_data];
+  auto& object = job->objects[u->file->engine_pos];
   auto& coll = object.coll;
   auto& os = job->engine->os;