RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-18 09:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15044 from lixiaoy1/master

Browse Source 
test/fio_ceph_objectstore: fix fio plugin build failure by engine_data

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-05-15 16:10:09 +08:00 committed by GitHub
commit 43a55828c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/fio/fio_ceph_objectstore.cc
View File

@ -209,7 +209,7 @@ Job::Job(Engine* engine, const thread_data* td)
for (uint32_t i = 0; i < td->o.nr_files; i++) { for (uint32_t i = 0; i < td->o.nr_files; i++) {
auto f = td->files[i]; auto f = td->files[i];
f->real_file_size = file_size; 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 // associate each object with a collection in a round-robin fashion
auto& coll = collections[i % collections.size()]; 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); fio_ro_check(td, u);
auto job = static_cast<Job*>(td->io_ops_data); 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& coll = object.coll;
auto& os = job->engine->os; auto& os = job->engine->os;