From: Enming Zhang <enming.zhang@umcloud.com>
Date: Fri, 20 Oct 2017 10:41:38 +0000 (+0800)
Subject: common/options.cc: cleanup readable literals for default sizes
X-Git-Tag: v13.0.1~429^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f3fe8264626f286184a8dedc40a0ac554dc6d01;p=ceph.git

common/options.cc: cleanup readable literals for default sizes

For better readablity.

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 513e91c18a0f2..c2bbefca90e94 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -662,7 +662,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("ms_dispatch_throttle_bytes", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(100 << 20)
+    .set_default(100_M)
     .set_description(""),
 
     Option("ms_bind_ipv6", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -2444,7 +2444,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_recovery_max_chunk", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(8<<20)
+    .set_default(8_M)
     .set_description(""),
 
     Option("osd_recovery_max_omap_entries_per_chunk", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
@@ -2452,7 +2452,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_copyfrom_max_chunk", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(8<<20)
+    .set_default(8_M)
     .set_description(""),
 
     Option("osd_push_per_object_cost", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
@@ -3015,7 +3015,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_max_omap_bytes_per_request", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(1<<30)
+    .set_default(1_G)
     .set_description(""),
 
     Option("osd_objectstore", Option::TYPE_STR, Option::LEVEL_ADVANCED)
@@ -3035,11 +3035,11 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_bench_large_size_max_throughput", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(100 << 20)
+    .set_default(100_M)
     .set_description(""),
 
     Option("osd_bench_max_block_size", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(64 << 20)
+    .set_default(64_M)
     .set_description(""),
 
     Option("osd_bench_duration", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
@@ -3824,15 +3824,15 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("filestore_max_xattr_value_size_xfs", Option::TYPE_UINT, Option::LEVEL_DEV)
-    .set_default(64<<10)
+    .set_default(64_K)
     .set_description(""),
 
     Option("filestore_max_xattr_value_size_btrfs", Option::TYPE_UINT, Option::LEVEL_DEV)
-    .set_default(64<<10)
+    .set_default(64_K)
     .set_description(""),
 
     Option("filestore_max_xattr_value_size_other", Option::TYPE_UINT, Option::LEVEL_DEV)
-    .set_default(1<<10)
+    .set_default(1_K)
     .set_description(""),
 
     Option("filestore_sloppy_crc", Option::TYPE_BOOL, Option::LEVEL_DEV)
@@ -3916,7 +3916,7 @@ std::vector<Option> get_global_options() {
     .set_description("Max IO operations in flight"),
 
     Option("filestore_queue_max_bytes", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(100 << 20)
+    .set_default(100_M)
     .set_description("Max (written) bytes in flight"),
 
     Option("filestore_caller_concurrency", Option::TYPE_INT, Option::LEVEL_DEV)
@@ -3924,7 +3924,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("filestore_expected_throughput_bytes", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(200 << 20)
+    .set_default(200_M)
     .set_description("Expected throughput of backend device (aids throttling calculations)"),
 
     Option("filestore_expected_throughput_ops", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
@@ -4052,7 +4052,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("journal_max_write_bytes", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(10 << 20)
+    .set_default(10_M)
     .set_description("Max bytes in flight to journal"),
 
     Option("journal_max_write_entries", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -4076,7 +4076,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("journal_align_min_size", Option::TYPE_INT, Option::LEVEL_DEV)
-    .set_default(64 << 10)
+    .set_default(64_K)
     .set_description(""),
 
     Option("journal_replay_from", Option::TYPE_INT, Option::LEVEL_DEV)
@@ -4766,7 +4766,7 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_obj_stripe_size", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(4 << 20)
+    .set_default(4_M)
     .set_description(""),
 
     Option("rgw_extended_http_attrs", Option::TYPE_STR, Option::LEVEL_ADVANCED)
@@ -4778,11 +4778,11 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_get_obj_window_size", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(16 << 20)
+    .set_default(16_M)
     .set_description(""),
 
     Option("rgw_get_obj_max_req_size", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(4 << 20)
+    .set_default(4_M)
     .set_description(""),
 
     Option("rgw_relaxed_s3_bucket_names", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -5205,15 +5205,15 @@ static std::vector<Option> get_rbd_options() {
                      "flushes so that writeback is safe"),
 
     Option("rbd_cache_size", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(32<<20)
+    .set_default(32_M)
     .set_description("cache size in bytes"),
 
     Option("rbd_cache_max_dirty", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(24<<20)
+    .set_default(24_M)
     .set_description("dirty limit in bytes - set to 0 for write-through caching"),
 
     Option("rbd_cache_target_dirty", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(16<<20)
+    .set_default(16_M)
     .set_description("target dirty limit in bytes"),
 
     Option("rbd_cache_max_dirty_age", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
@@ -5433,7 +5433,7 @@ std::vector<Option> get_mds_options() {
     .set_description(""),
 
     Option("mds_max_xattr_pairs_size", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(64 << 10)
+    .set_default(64_K)
     .set_description(""),
 
     Option("mds_cache_size", Option::TYPE_INT, Option::LEVEL_ADVANCED)