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

rgw: set num_shards on 'radosgw-admin data sync init' #18883

Merged
merged 2 commits into from Nov 15, 2017

Conversation

cbodley
Copy link
Contributor

@cbodley cbodley commented Nov 10, 2017

Fixes: http://tracker.ceph.com/issues/22083 (see also #18852)

adds ceph-dencoder support for rgw sync status types, used to validate the fix

without the fix:

$ bin/radosgw-admin -c run/c2/ceph.conf data sync init --source-zone a1
$ bin/rados -c run/c2/ceph.conf -p a2.rgw.log get datalog.sync-status.c00ae4fb-6819-4efc-815d-1e30dfcd24df data.sync-status
$ bin/ceph-dencoder type rgw_data_sync_info import data.sync-status decode dump_json
{
    "status": "building-full-sync-maps",
    "num_shards": 0,
    "instance_id": 988322046502566107
}

with the fix:

$ bin/radosgw-admin -c run/c2/ceph.conf data sync init --source-zone a1
$ bin/rados -c run/c2/ceph.conf -p a2.rgw.log get datalog.sync-status.1b6d8d3f-fbdb-402a-a92b-f19e5b474c1e data.sync-status
$ bin/ceph-dencoder type rgw_data_sync_info import data.sync-status decode dump_json                                                             
{
    "status": "building-full-sync-maps",
    "num_shards": 128,
    "instance_id": 14612016681866375495
}

@yuriw
Copy link
Contributor

yuriw commented Nov 14, 2017

@cbodley
Copy link
Contributor Author

cbodley commented Nov 15, 2017

jenkins test this please

@cbodley
Copy link
Contributor Author

cbodley commented Nov 15, 2017

hmm, dencoder tests failing on the new types

edit: generate_test_instances() was using real_clock::now() to set timestamps, so the output of consecutive tests was different

Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley cbodley merged commit 297cd6c into ceph:master Nov 15, 2017
@cbodley cbodley deleted the wip-22083+ branch November 15, 2017 19:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants