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

rgw: datalog trim and mdlog trim handles the result returned by osd incorrectly. #15507

Merged
merged 1 commit into from Jun 8, 2017

Conversation

Projects
None yet
4 participants
@zhangsw
Contributor

zhangsw commented Jun 6, 2017

The log trim operation can't remove the log as expected.

Fixes: http://tracker.ceph.com/issues/20190

Signed-off-by: Zhang Shaowen zhangshaowen@cmss.chinamobile.com

@zhangsw zhangsw changed the title from rgw: datalog trim and mdlog trim handles the result which returned from osd incorrectly. to rgw: datalog trim and mdlog trim handles the result which returned by osd incorrectly. Jun 6, 2017

@zhangsw zhangsw changed the title from rgw: datalog trim and mdlog trim handles the result which returned by osd incorrectly. to rgw: datalog trim and mdlog trim handles the result returned by osd incorrectly. Jun 6, 2017

@mattbenjamin mattbenjamin requested a review from cbodley Jun 6, 2017

@@ -1933,7 +1933,7 @@ int RGWDataChangesLog::trim_entries(int shard_id, const real_time& start_time, c
ret = store->time_log_trim(oids[shard_id], start_time, end_time, start_marker, end_marker);
if (ret == -ENOENT)
if (ret == -ENODATA)

This comment has been minimized.

@cbodley

cbodley Jun 6, 2017

Contributor

each of these should check for both ENOENT and ENODATA

This comment has been minimized.

@zhangsw

zhangsw Jun 7, 2017

Contributor

yes,I‘ve added that

rgw: datalog trim and mdlog trim handles the result returned by osd
incorrectly.

Fixes: http://tracker.ceph.com/issues/20190

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
@cbodley

cbodley approved these changes Jun 7, 2017

@yehudasa yehudasa merged commit 2076175 into ceph:master Jun 8, 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

@zhangsw zhangsw deleted the zhangsw:fix-rgw-logtrim-bug branch Jun 14, 2017

dongbula pushed a commit to dongbula/ceph that referenced this pull request Jul 22, 2017

Merge pull request ceph#15507 from zhangsw/fix-rgw-logtrim-bug
rgw: datalog trim and mdlog trim handles the result returned by osd incorrec

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment