From 9a71b8ad5f771903fb25dfc121cd617dfaf072a1 Mon Sep 17 00:00:00 2001 From: Paul Emmerich Date: Mon, 7 Oct 2019 00:14:05 +0200 Subject: [PATCH] radosgw-admin: update help for max-concurrent-ios --max-concurrent-ios works for all bucket operations and is quite important when working with huge buckets Signed-off-by: Paul Emmerich --- doc/man/8/radosgw-admin.rst | 12 +++++++----- src/rgw/rgw_admin.cc | 2 +- src/test/cli/radosgw-admin/help.t | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/man/8/radosgw-admin.rst b/doc/man/8/radosgw-admin.rst index 23a81910898..6cf1f110083 100644 --- a/doc/man/8/radosgw-admin.rst +++ b/doc/man/8/radosgw-admin.rst @@ -807,6 +807,13 @@ Options When specified with bucket deletion and bypass-gc set to true, ignores bucket index consistency. +.. option:: --max-concurrent-ios + + Maximum concurrent ios for bucket operations. Affects operations that + scan the bucket index, e.g., listing, deletion, and all scan/search + operations such as finding orphans or checking the bucket index. + Default is 32. + Quota Options ============= @@ -839,11 +846,6 @@ Orphans Search Options Set the job id (for orphans find) -.. option:: --max-concurrent-ios - - Maximum concurrent ios for orphans find. - Default is 32. - Orphans list-jobs options ========================= diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 6e7fa46e5a1..8dab4b6907d 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -364,6 +364,7 @@ void usage() cout << " --min-rewrite-stripe-size min stripe size for object rewrite (default 0)\n"; cout << " --trim-delay-ms time interval in msec to limit the frequency of sync error log entries trimming operations,\n"; cout << " the trimming process will sleep the specified msec for every 1000 entries trimmed\n"; + cout << " --max-concurrent-ios maximum concurrent ios for bucket operations (default: 32)\n"; cout << "\n"; cout << " := \"YYYY-MM-DD[ hh:mm:ss]\"\n"; cout << "\nQuota options:\n"; @@ -374,7 +375,6 @@ void usage() cout << " --num-shards num of shards to use for keeping the temporary scan info\n"; cout << " --orphan-stale-secs num of seconds to wait before declaring an object to be an orphan (default: 86400)\n"; cout << " --job-id set the job id (for orphans find)\n"; - cout << " --max-concurrent-ios maximum concurrent ios for orphans find (default: 32)\n"; cout << " --detail detailed mode, log and stat head objects as well\n"; cout << "\nOrphans list-jobs options:\n"; cout << " --extra-info provide extra info in job list\n"; diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t index 5cbecfdc7fc..23bb85cf472 100644 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@ -278,6 +278,7 @@ --min-rewrite-stripe-size min stripe size for object rewrite (default 0) --trim-delay-ms time interval in msec to limit the frequency of sync error log entries trimming operations, the trimming process will sleep the specified msec for every 1000 entries trimmed + --max-concurrent-ios maximum concurrent ios for bucket operations (default: 32) := "YYYY-MM-DD[ hh:mm:ss]" @@ -290,7 +291,6 @@ --num-shards num of shards to use for keeping the temporary scan info --orphan-stale-secs num of seconds to wait before declaring an object to be an orphan (default: 86400) --job-id set the job id (for orphans find) - --max-concurrent-ios maximum concurrent ios for orphans find (default: 32) --detail detailed mode, log and stat head objects as well Orphans list-jobs options: -- 2.39.5