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

FileStore: clarify debug/error output

Browse Source 
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
This commit is contained in:
Samuel Just 2012-03-12 13:39:13 -07:00
parent e19417ef55
commit 9969bba879
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/os/FileStore.cc
View File

@ -3162,28 +3162,30 @@ int FileStore::_do_copy_range(int from, int to, uint64_t srcoff, uint64_t len, u
while (pos < end) {
int l = MIN(end-pos, buflen);
r = ::read(from, buf, l);
dout(25) << " read from " << from << "~" << l << " got " << r << dendl;
dout(25) << " read from " << pos << "~" << l << " got " << r << dendl;
if (r < 0) {
r = -errno;
derr << "FileStore::_do_copy_range: read error at " << from << "~" << len
derr << "FileStore::_do_copy_range: read error at " << pos << "~" << len
<< ", " << cpp_strerror(r) << dendl;
break;
}
if (r == 0) {
// hrm, bad source range, wtf.
r = -ERANGE;
derr << "FileStore::_do_copy_range got short read result at " << from
<< " of " << from << "~" << len << dendl;
derr << "FileStore::_do_copy_range got short read result at " << pos
<< " of fd " << from << " len " << len << dendl;
break;
}
int op = 0;
while (op < r) {
int r2 = safe_write(to, buf+op, r-op);
dout(25) << " write to " << to << "~" << (r-op) << " got " << r2 << dendl;
dout(25) << " write to " << to << " len " << (r-op)
<< " got " << r2 << dendl;
if (r2 < 0) {
r = r2;
derr << "FileStore::_do_copy_range: write error at " << to << "~" << r-op
<< ", " << cpp_strerror(r) << dendl;
derr << "FileStore::_do_copy_range: write error at " << pos << "~"
<< r-op << ", " << cpp_strerror(r) << dendl;
break;
}
op += (r-op);