New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

librados,osdc: kill ack vs commit distinction #12607

Merged
merged 8 commits into from Jan 9, 2017

Conversation

Projects
None yet
3 participants
@liewegas
Member

liewegas commented Dec 21, 2016

Remove duplicate callbacks. Simplify code.

@liewegas liewegas requested a review from jdurgin Dec 21, 2016

@liewegas liewegas added the cephfs label Dec 21, 2016

@jdurgin

woot

@liewegas liewegas added the needs-qa label Dec 22, 2016

@liewegas

This comment has been minimized.

Member

liewegas commented Dec 22, 2016

@jdurgin one additional patch to Objecter

@jdurgin

This comment has been minimized.

Member

jdurgin commented Dec 23, 2016

removing oncommit_sync looks good

liewegas added some commits Dec 20, 2016

client: remove special ack vs commit behavior
1) Do not submit a separate ack callback; just the
blocking cond one.

2) Do the sync write completion synchronously--much
simpler now!

Signed-off-by: Sage Weil <sage@redhat.com>
librados: eliminiate ack vs commit distinction
- paper over the distinction in the public interface
- consolidate internal completions and flags

Signed-off-by: Sage Weil <sage@redhat.com>
osdc/Objecter: go to single callback for mutate()
...and prepare_mutate_op().

Signed-off-by: Sage Weil <sage@redhat.com>
osdc/Filer: go to single ack for update methods
Signed-off-by: Sage Weil <sage@redhat.com>
osdc/Objecter: drop onack from _modify
Signed-off-by: Sage Weil <sage@redhat.com>
osdc/Objecter: remove onack from remaining mutate methods
Signed-off-by: Sage Weil <sage@redhat.com>
osdc/Objecter: onack + oncommit -> onfinish etc
And num_unack + num_unsafe -> num_in_flight.
l_osdc_op_ack + l_osdc_op_commit -> l_osdc_op_reply

Signed-off-by: Sage Weil <sage@redhat.com>
osdc/Objecter: remove internal oncommit_sync
We can use onfinish for the linger completions.

Signed-off-by: Sage Weil <sage@redhat.com>
@@ -12088,13 +12069,11 @@ int Client::ll_write_block(Inode *in, uint64_t blockid,
if (true || sync) {
/* if write is stable, the epilogue is waiting on
* flock */
onack = new C_NoopContext;

This comment has been minimized.

@jcsp

jcsp Jan 9, 2017

Contributor

This was the last user of C_NoopContext so could remove it from Context.h too

@jcsp

This comment has been minimized.

Contributor

jcsp commented Jan 9, 2017

Looks fine to me!

@jcsp

jcsp approved these changes Jan 9, 2017

@liewegas liewegas merged commit 25c9910 into ceph:master Jan 9, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@liewegas liewegas deleted the liewegas:wip-librados-killack branch Jan 9, 2017

xiexingguo added a commit to xiexingguo/ceph that referenced this pull request Jan 10, 2017

librados: fix building crash
See ceph#12607

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment