Skip to content
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

osd: mark queued flag for op #12352

Merged
merged 1 commit into from Dec 13, 2016
Merged

osd: mark queued flag for op #12352

merged 1 commit into from Dec 13, 2016

Conversation

wycbox
Copy link

@wycbox wycbox commented Dec 7, 2016

queue_op will check the op epoch with current osdmap epoch,
and then, the op will be push into waiting_for_map or mark
queued flag.
but when the op pop from waiting_for_map, take_op_map_waiters
forget to mark queued flag before handle it.

Signed-off-by: Yunchuan Wen yunchuan.wen@kylin-cloud.com

queue_op will check the op epoch with current osdmap epoch,
and then, the op will be push into waiting_for_map or mark
queued flag.
but when the op pop from waiting_for_map, take_op_map_waiters
forget to mark queued flag before handle it.

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
@tchaikov tchaikov self-assigned this Dec 9, 2016
@tchaikov
Copy link
Contributor

@tchaikov tchaikov merged commit 1173361 into ceph:master Dec 13, 2016
bafna pushed a commit to jiocloudDSS/ceph that referenced this pull request Dec 29, 2016
Fixes: ceph#12352

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>

Conflicts:
	src/rgw/rgw_rest_swift.cc
	src/rgw/rgw_rest_swift.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants