RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: Read inline data path

Browse Source 
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Signed-off-by: Li Wang <liwang@ubuntukylin.com>
This commit is contained in:
Li Wang 2013-12-30 17:40:16 +08:00 committed by Yunchuan Wen
parent 4a5c09909d
commit a0cb524251
1 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/client/Client.cc
View File

@ -5858,6 +5858,41 @@ int Client::_read(Fh *f, int64_t offset, uint64_t size, bufferlist *bl)
movepos = true;
}
Mutex uninline_flock("Clinet::_read_uninline_data flock");
Cond uninline_cond;
bool uninline_done = false;
int uninline_ret = 0;
Context *onuninline = NULL;
if (in->inline_version < CEPH_INLINE_NONE) {
if (!(have & CEPH_CAP_FILE_CACHE)) {
onuninline = new C_SafeCond(&uninline_flock,
&uninline_cond,
&uninline_done,
&uninline_ret);
uninline_data(in, onuninline);
} else {
uint32_t len = in->inline_data.length();
uint64_t endoff = offset + size;
if (endoff > in->size)
endoff = in->size;
if (offset < len) {
if (endoff <= len) {
bl->substr_of(in->inline_data, offset, endoff - offset);
} else {
bl->substr_of(in->inline_data, offset, len - offset);
bl->append_zero(endoff - len);
}
} else if (offset < endoff) {
bl->append_zero(endoff - offset);
}
goto success;
}
}
if (!conf->client_debug_force_sync_read &&
(cct->_conf->client_oc && (have & CEPH_CAP_FILE_CACHE))) {
@ -5874,6 +5909,8 @@ int Client::_read(Fh *f, int64_t offset, uint64_t size, bufferlist *bl)
goto done;
}
success:
if (movepos) {
// adjust fd pos
f->pos = offset+bl->length();
@ -5895,6 +5932,24 @@ int Client::_read(Fh *f, int64_t offset, uint64_t size, bufferlist *bl)
done:
// done!
if (onuninline) {
client_lock.Unlock();
uninline_flock.Lock();
while (!uninline_done)
uninline_cond.Wait(uninline_flock);
uninline_flock.Unlock();
client_lock.Lock();
if (uninline_ret >= 0 || uninline_ret == -ECANCELED) {
in->inline_data.clear();
in->inline_version = CEPH_INLINE_NONE;
mark_caps_dirty(in, CEPH_CAP_FILE_WR);
check_caps(in, false);
} else
r = uninline_ret;
}
put_cap_ref(in, CEPH_CAP_FILE_RD);
return r;
}