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

os/FileJournal: limit size of aio submission

Browse Source 
Limit size of each aio submission to IOV_MAX-1 (to be safe).  Take care to
only mark the last aio with the seq to signal completion.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-12-28 16:47:28 -08:00
parent 076b418c7f
commit dda7b65189
1 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/os/FileJournal.cc
View File

@ -1251,40 +1251,51 @@ int FileJournal::write_aio_bl(off64_t& pos, bufferlist& bl, uint64_t seq)
dout(20) << "write_aio_bl " << pos << "~" << bl.length() << " seq " << seq << dendl;
aio_queue.push_back(aio_info(bl, pos, seq));
aio_info& aio = aio_queue.back();
aio.iov = new iovec[aio.bl.buffers().size()];
int n = 0;
for (std::list<buffer::ptr>::const_iterator p = aio.bl.buffers().begin();
p != aio.bl.buffers().end();
++p, ++n) {
aio.iov[n].iov_base = (void *)p->c_str();
aio.iov[n].iov_len = p->length();
}
io_prep_pwritev(&aio.iocb, fd, aio.iov, n, pos);
dout(20) << "write_aio_bl .. " << aio.off << "~" << aio.len
<< " in " << n << dendl;
aio_num++;
aio_bytes += aio.len;
iocb *piocb = &aio.iocb;
int attempts = 10;
do {
int r = io_submit(aio_ctx, 1, &piocb);
if (r < 0) {
derr << "io_submit to " << aio.off << "~" << aio.len
<< " got " << cpp_strerror(r) << dendl;
if (r == -EAGAIN && attempts-- > 0) {
usleep(500);
continue;
}
assert(0 == "io_submit got unexpected error");
while (bl.length() > 0) {
int max = MIN(bl.buffers().size(), IOV_MAX-1);
iovec *iov = new iovec[max];
int n = 0;
unsigned len = 0;
for (std::list<buffer::ptr>::const_iterator p = bl.buffers().begin();
n < max;
++p, ++n) {
assert(p != bl.buffers().end());
iov[n].iov_base = (void *)p->c_str();
iov[n].iov_len = p->length();
len += p->length();
}
} while (false);
pos += aio.len;
bufferlist tbl;
bl.splice(0, len, &tbl); // move bytes from bl -> tbl
aio_queue.push_back(aio_info(tbl, pos, bl.length() > 0 ? 0 : seq));
aio_info& aio = aio_queue.back();
aio.iov = iov;
io_prep_pwritev(&aio.iocb, fd, aio.iov, n, pos);
dout(20) << "write_aio_bl .. " << aio.off << "~" << aio.len
<< " in " << n << dendl;
aio_num++;
aio_bytes += aio.len;
iocb *piocb = &aio.iocb;
int attempts = 10;
do {
int r = io_submit(aio_ctx, 1, &piocb);
if (r < 0) {
derr << "io_submit to " << aio.off << "~" << aio.len
<< " got " << cpp_strerror(r) << dendl;
if (r == -EAGAIN && attempts-- > 0) {
usleep(500);
continue;
}
assert(0 == "io_submit got unexpected error");
}
} while (false);
pos += aio.len;
}
write_finish_cond.Signal();
return 0;
}