RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #25622 into master

Browse Source 
* refs/pull/25622/head:
	Objecter.cc: make op resend logic more readable

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
This commit is contained in:
Sage Weil 2018-12-19 21:23:26 -06:00
commit 3a2b090623
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osdc/Objecter.cc
View File

@ -2870,13 +2870,12 @@ int Objecter::_calc_target(op_target_t *t, Connection *con, bool any_change)
force_resend = true;
}
bool unpaused = !target_should_be_paused(t);
if (t->paused && unpaused) {
t->paused = false;
} else {
t->paused = !unpaused;
unpaused = false;
bool unpaused = false;
bool should_be_paused = target_should_be_paused(t);
if (t->paused && !should_be_paused) {
unpaused = true;
}
t->paused = should_be_paused;
bool legacy_change =
t->pgid != pgid ||