From: Kefu Chai <kchai@redhat.com>
Date: Wed, 23 Aug 2017 06:35:19 +0000 (+0800)
Subject: common/options: use user-defined literals for default intervals
X-Git-Tag: v12.2.3~123^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ecf102618ec34afee96093812e68382e6b9c4872;p=ceph.git

common/options: use user-defined literals for default intervals

for better readablility

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3704fe283b606737533d62a082337381b95bdbd9)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 8af849e9029..38ca2af9f4b 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -132,6 +132,15 @@ void Option::dump(Formatter *f) const
   f->close_section();
 }
 
+constexpr unsigned long long operator"" _min (unsigned long long min) {
+  return min * 60;
+}
+constexpr unsigned long long operator"" _hr (unsigned long long hr) {
+  return hr * 60 * 60;
+}
+constexpr unsigned long long operator"" _day (unsigned long long day) {
+  return day * 60 * 60 * 24;
+}
 constexpr unsigned long long operator"" _K (unsigned long long n) {
   return n << 10;
 }
@@ -901,7 +910,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("mon_subscribe_interval", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(24*3600)
+    .set_default(1_day)
     .set_description(""),
 
     Option("mon_delta_reset_interval", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
@@ -909,7 +918,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("mon_osd_laggy_halflife", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(60*60)
+    .set_default(1_hr)
     .set_description(""),
 
     Option("mon_osd_laggy_weight", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
@@ -1202,7 +1211,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("mon_health_to_clog_interval", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(3600)
+    .set_default(1_hr)
     .set_description(""),
 
     Option("mon_health_to_clog_tick_interval", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
@@ -1248,11 +1257,11 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("mon_scrub_interval", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(3600*24)
+    .set_default(1_day)
     .set_description(""),
 
     Option("mon_scrub_timeout", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(60*5)
+    .set_default(5_min)
     .set_description(""),
 
     Option("mon_scrub_max_keys", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -1364,7 +1373,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("mon_osd_blacklist_default_expire", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(60*60)
+    .set_default(1_hr)
     .set_description(""),
 
     Option("mon_osd_crush_smoke_test", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -1448,11 +1457,11 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("auth_mon_ticket_ttl", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(60*60*12)
+    .set_default(12_hr)
     .set_description(""),
 
     Option("auth_service_ticket_ttl", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(60*60)
+    .set_default(1_hr)
     .set_description(""),
 
     Option("auth_debug", Option::TYPE_BOOL, Option::LEVEL_DEV)
@@ -2302,11 +2311,11 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_remove_thread_timeout", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(60*60)
+    .set_default(1_hr)
     .set_description(""),
 
     Option("osd_remove_thread_suicide_timeout", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(10*60*60)
+    .set_default(10_hr)
     .set_description(""),
 
     Option("osd_command_thread_timeout", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -2458,11 +2467,11 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_scrub_min_interval", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(60*60*24)
+    .set_default(1_day)
     .set_description(""),
 
     Option("osd_scrub_max_interval", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(7*60*60*24)
+    .set_default(7_day)
     .set_description(""),
 
     Option("osd_scrub_interval_randomize_ratio", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
@@ -2494,7 +2503,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_deep_scrub_interval", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
-    .set_default(60*60*24*7)
+    .set_default(7_day)
     .set_description(""),
 
     Option("osd_deep_scrub_randomize_ratio", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
@@ -2506,7 +2515,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_deep_scrub_update_digest_min_age", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(2*60*60)
+    .set_default(2_hr)
     .set_description(""),
 
     Option("osd_class_dir", Option::TYPE_STR, Option::LEVEL_ADVANCED)
@@ -4450,7 +4459,7 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_keystone_revocation_interval", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(15 * 60)
+    .set_default(15_min)
     .set_description(""),
 
     Option("rgw_keystone_verify_ssl", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -4522,7 +4531,7 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_swift_token_expiration", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(24 * 3600)
+    .set_default(1_day)
     .set_description(""),
 
     Option("rgw_print_continue", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -4721,15 +4730,15 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_gc_obj_min_wait", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(2 * 3600)
+    .set_default(2_hr)
     .set_description(""),
 
     Option("rgw_gc_processor_max_time", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(3600)
+    .set_default(1_hr)
     .set_description(""),
 
     Option("rgw_gc_processor_period", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(3600)
+    .set_default(1_hr)
     .set_description(""),
 
     Option("rgw_s3_success_create_obj_status", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -4853,7 +4862,7 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_user_quota_sync_interval", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(3600 * 24)
+    .set_default(1_day)
     .set_description(""),
 
     Option("rgw_user_quota_sync_idle_users", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -4861,7 +4870,7 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_user_quota_sync_wait_time", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(3600 * 24)
+    .set_default(1_day)
     .set_description(""),
 
     Option("rgw_user_default_quota_max_objects", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -4885,7 +4894,7 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_olh_pending_timeout_sec", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(3600)
+    .set_default(1_hr)
     .set_description(""),
 
     Option("rgw_user_max_buckets", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -4893,7 +4902,7 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_objexp_gc_interval", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(60 * 10)
+    .set_default(10_min)
     .set_description(""),
 
     Option("rgw_objexp_time_step", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
@@ -5045,7 +5054,7 @@ std::vector<Option> get_rgw_options() {
     .set_description(""),
 
     Option("rgw_reshard_thread_interval", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(60 * 10)
+    .set_default(10_min)
     .set_description(""),
   });
 }