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: add 'state==SyncState::IncrementalSync' condition when add item … #14552

Merged
merged 1 commit into from Apr 26, 2017

Conversation

Projects
None yet
2 participants
@shashalu
Contributor

shashalu commented Apr 14, 2017

…to shards_behind.

after running 'radosgw-admin data sync init', the sync_marker's state will change to FullSync, but the marker didn't clean. So 'sync status' command will wrongly inset shards_behind.

Signed-off-by: Shasha Lu lu.shasha@eisoo.com

@@ -1897,7 +1897,7 @@ static void get_md_sync_status(list<string>& status)
continue;
}
auto master_marker = iter->second.marker;
if (master_marker > local_iter.second.marker) {
if (local_iter.second.state == rgw_meta_sync_marker::SyncState::IncrementalSync && master_marker > local_iter.second.marker) {

This comment has been minimized.

@cbodley

cbodley Apr 21, 2017

Contributor

add a line break please

if (local_iter.second.state == rgw_meta_sync_marker::SyncState::IncrementalSync &&
    master_marker > local_iter.second.marker) {

This comment has been minimized.

@shashalu

shashalu Apr 24, 2017

Contributor

Already added.

@@ -2044,7 +2044,7 @@ static void get_data_sync_status(const string& source_zone, list<string>& status
continue;
}
auto master_marker = iter->second.marker;
if (master_marker > local_iter.second.marker) {
if (local_iter.second.state == rgw_data_sync_marker::SyncState::IncrementalSync && master_marker > local_iter.second.marker) {

This comment has been minimized.

@cbodley

cbodley Apr 21, 2017

Contributor

line break please

This comment has been minimized.

@shashalu

shashalu Apr 24, 2017

Contributor

Already added.

@cbodley cbodley self-assigned this Apr 21, 2017

rgw: add 'state==SyncState::IncrementalSync' condition when add item …
…to shards_behind.

after running 'radosgw-admin data sync init', the sync_marker's state will change to FullSync, but the marker didn't clean. So 'sync status' command will wrongly inset shards_behind.

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
@cbodley

This comment has been minimized.

Contributor

cbodley commented Apr 24, 2017

jenkins test this please

1 similar comment
@cbodley

This comment has been minimized.

Contributor

cbodley commented Apr 25, 2017

jenkins test this please

@cbodley

This comment has been minimized.

Contributor

cbodley commented Apr 25, 2017

@mattbenjamin @yehudasa this is ready to merge, but the build check keeps failing - could one of you please override?

@cbodley cbodley merged commit 31576a0 into ceph:master Apr 26, 2017

3 of 4 checks passed

arm build Build triggered. sha1 is merged.
Details
Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@shashalu shashalu deleted the shashalu:fix-sync-status branch Apr 27, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment