]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
common/options: fix overflowing 64 bit literals
authorJohn Spray <john.spray@redhat.com>
Thu, 20 Jul 2017 11:58:41 +0000 (07:58 -0400)
committerJohn Spray <john.spray@redhat.com>
Fri, 21 Jul 2017 10:27:30 +0000 (06:27 -0400)
This manifested as a failure in objectstore tool test_fuse.sh

Signed-off-by: John Spray <john.spray@redhat.com>
src/common/options.cc

index 5f2e1f574c312e0e909ab832c32b3c2c0cc333a1..aff5608732ecb4b506c8787e5197852e24ac61ac 100644 (file)
@@ -1250,7 +1250,7 @@ const std::vector<Option> ceph_options = {
   .set_description(""),
 
   Option("mon_data_size_warn", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-  .set_default(15*1024*1024*1024)
+  .set_default(15ull*1024*1024*1024)
   .set_description(""),
 
   Option("mon_warn_not_scrubbed", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -3539,7 +3539,7 @@ const std::vector<Option> ceph_options = {
   .set_description(""),
 
   Option("bluestore_block_size", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-  .set_default(10 * 1024*1024*1024)
+  .set_default(10ull * 1024*1024*1024)
   .set_description(""),
 
   Option("bluestore_block_create", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -3715,11 +3715,11 @@ const std::vector<Option> ceph_options = {
   .set_description(""),
 
   Option("bluestore_cache_size_hdd", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-  .set_default(1*1024*1024*1024)
+  .set_default(1ull*1024*1024*1024)
   .set_description(""),
 
   Option("bluestore_cache_size_ssd", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-  .set_default(3*1024*1024*1024)
+  .set_default(3ull*1024*1024*1024)
   .set_description(""),
 
   Option("bluestore_cache_meta_ratio", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)