diff options
| author | Jos Collin <jcollin@redhat.com> | 2017-11-16 05:55:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 05:55:32 +0100 |
| commit | 407238a42c111d44bffeb77678a1a72170b6ac2d (patch) | |
| tree | 562b0e71ecaf0072e29649103325843e6655d32a /src | |
| parent | Merge pull request #18808 from tchaikov/wip-qa-max-pg-per-osd (diff) | |
| parent | rgw: add rewrite related cmd and parameter into radosgw-admin help info (diff) | |
| download | ceph-407238a42c111d44bffeb77678a1a72170b6ac2d.tar.xz ceph-407238a42c111d44bffeb77678a1a72170b6ac2d.zip | |
Merge pull request #18918 from ZVampirEM77/wip-em-rewrite-cmd
rgw: add rewrite cmd and options into radosgw-admin usage and doc
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/rgw/rgw_admin.cc | 5 | ||||
| -rw-r--r-- | src/test/cli/radosgw-admin/help.t | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 66b5c19c833..22fb0f0ce74 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -83,6 +83,7 @@ void usage() cout << " bucket rm remove bucket\n"; cout << " bucket check check bucket index\n"; cout << " bucket reshard reshard bucket\n"; + cout << " bucket rewrite rewrite all objects in the specified bucket\n"; cout << " bucket sync disable disable bucket sync\n"; cout << " bucket sync enable enable bucket sync\n"; cout << " bi get retrieve bucket index object entries\n"; @@ -92,6 +93,7 @@ void usage() cout << " object rm remove object\n"; cout << " object stat stat an object for its metadata\n"; cout << " object unlink unlink object from bucket index\n"; + cout << " object rewrite rewrite the specified object\n"; cout << " objects expire run expired objects cleanup\n"; cout << " period delete delete a period\n"; cout << " period get get period info\n"; @@ -310,6 +312,9 @@ void usage() cout << " object deletions by not involving GC\n"; cout << " --inconsistent-index when specified with bucket deletion and bypass-gc set to true,\n"; cout << " ignores bucket index consistency\n"; + cout << " --min-rewrite-size specify the min object size condition for bucket rewrite (default 4M)\n"; + cout << " --max-rewrite-size specify the max object size condition for bucket rewrite (default ULLONG_MAX)\n"; + cout << " --min-rewrite-stripe-size specify the min stripe size condition for object rewrite (default 0)\n"; cout << "\n"; cout << "<date> := \"YYYY-MM-DD[ hh:mm:ss]\"\n"; cout << "\nQuota options:\n"; diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t index f14f6c65341..19d89f82cbc 100644 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@ -25,6 +25,7 @@ bucket rm remove bucket bucket check check bucket index bucket reshard reshard bucket + bucket rewrite rewrite all objects in the specified bucket bucket sync disable disable bucket sync bucket sync enable enable bucket sync bi get retrieve bucket index object entries @@ -34,6 +35,7 @@ object rm remove object object stat stat an object for its metadata object unlink unlink object from bucket index + object rewrite rewrite the specified object objects expire run expired objects cleanup period delete delete a period period get get period info @@ -252,6 +254,9 @@ object deletions by not involving GC --inconsistent-index when specified with bucket deletion and bypass-gc set to true, ignores bucket index consistency + --min-rewrite-size specify the min object size condition for bucket rewrite (default 4M) + --max-rewrite-size specify the max object size condition for bucket rewrite (default ULLONG_MAX) + --min-rewrite-stripe-size specify the min stripe size condition for object rewrite (default 0) <date> := "YYYY-MM-DD[ hh:mm:ss]" |