From 4c13014a2a9802e979620f141e79507bb13197b8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 21 Oct 2016 11:30:08 -0400 Subject: [PATCH] ceph_test_objectstore: move main() to bottom Signed-off-by: Sage Weil --- src/test/objectstore/store_test.cc | 78 +++++++++++++++--------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index b0a1dd6bbc11a..973923c0f3e1c 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -5711,45 +5711,6 @@ TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {} #endif -int main(int argc, char **argv) { - vector args; - argv_to_vec(argc, (const char **)argv, args); - env_to_vec(args); - - global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); - common_init_finish(g_ceph_context); - - g_ceph_context->_conf->set_val("osd_journal_size", "400"); - g_ceph_context->_conf->set_val("filestore_index_retry_probability", "0.5"); - g_ceph_context->_conf->set_val("filestore_op_thread_timeout", "1000"); - g_ceph_context->_conf->set_val("filestore_op_thread_suicide_timeout", "10000"); - g_ceph_context->_conf->set_val("filestore_debug_disable_sharded_check", "true"); - //g_ceph_context->_conf->set_val("filestore_fiemap", "true"); - g_ceph_context->_conf->set_val("bluestore_fsck_on_mount", "true"); - g_ceph_context->_conf->set_val("bluestore_fsck_on_umount", "true"); - g_ceph_context->_conf->set_val("bluestore_debug_misc", "true"); - g_ceph_context->_conf->set_val("bluestore_debug_small_allocations", "4"); - g_ceph_context->_conf->set_val("bluestore_debug_freelist", "true"); - g_ceph_context->_conf->set_val("bluestore_clone_cow", "true"); - g_ceph_context->_conf->set_val("bluestore_max_alloc_size", "196608"); - - // set small cache sizes so we see trimming during Synthetic tests - g_ceph_context->_conf->set_val("bluestore_buffer_cache_size", "2000000"); - g_ceph_context->_conf->set_val("bluestore_onode_cache_size", "500"); - - // specify device size - g_ceph_context->_conf->set_val("bluestore_block_size", "10240000000"); - - g_ceph_context->_conf->set_val( - "enable_experimental_unrecoverable_data_corrupting_features", "*"); - g_ceph_context->_conf->apply_changes(NULL); - - ::testing::InitGoogleTest(&argc, argv); - int r = RUN_ALL_TESTS(); - g_ceph_context->put(); - return r; -} - void doMany4KWritesTest(boost::scoped_ptr& store, unsigned max_objects, unsigned max_ops, @@ -5827,6 +5788,45 @@ TEST_P(StoreTest, TooManyBlobsTest) { ASSERT_EQ(res_stat.allocated, max_object); } +int main(int argc, char **argv) { + vector args; + argv_to_vec(argc, (const char **)argv, args); + env_to_vec(args); + + global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); + common_init_finish(g_ceph_context); + + g_ceph_context->_conf->set_val("osd_journal_size", "400"); + g_ceph_context->_conf->set_val("filestore_index_retry_probability", "0.5"); + g_ceph_context->_conf->set_val("filestore_op_thread_timeout", "1000"); + g_ceph_context->_conf->set_val("filestore_op_thread_suicide_timeout", "10000"); + g_ceph_context->_conf->set_val("filestore_debug_disable_sharded_check", "true"); + //g_ceph_context->_conf->set_val("filestore_fiemap", "true"); + g_ceph_context->_conf->set_val("bluestore_fsck_on_mount", "true"); + g_ceph_context->_conf->set_val("bluestore_fsck_on_umount", "true"); + g_ceph_context->_conf->set_val("bluestore_debug_misc", "true"); + g_ceph_context->_conf->set_val("bluestore_debug_small_allocations", "4"); + g_ceph_context->_conf->set_val("bluestore_debug_freelist", "true"); + g_ceph_context->_conf->set_val("bluestore_clone_cow", "true"); + g_ceph_context->_conf->set_val("bluestore_max_alloc_size", "196608"); + + // set small cache sizes so we see trimming during Synthetic tests + g_ceph_context->_conf->set_val("bluestore_buffer_cache_size", "2000000"); + g_ceph_context->_conf->set_val("bluestore_onode_cache_size", "500"); + + // specify device size + g_ceph_context->_conf->set_val("bluestore_block_size", "10240000000"); + + g_ceph_context->_conf->set_val( + "enable_experimental_unrecoverable_data_corrupting_features", "*"); + g_ceph_context->_conf->apply_changes(NULL); + + ::testing::InitGoogleTest(&argc, argv); + int r = RUN_ALL_TESTS(); + g_ceph_context->put(); + return r; +} + /* * Local Variables: * compile-command: "cd ../.. ; make ceph_test_objectstore && -- 2.39.5