提交 663e7976 编写于 作者: W Wu Tao 提交者: qinzuoyan

bugfix: link tcmalloc by default (#289)

上级 8d3bae3d
......@@ -40,7 +40,7 @@ before_script:
- ulimit -c unlimited -S
script:
- ./run.sh build --skip_thirdparty && ./run.sh test
- ./run.sh build --skip_thirdparty --disable_gperf && ./run.sh test
after_script:
- ./run.sh stop_zk
......
Subproject commit fa251e2919abef66bbd2ca52920477ae96f899ce
Subproject commit 46e4c48b180030f16bc7c6324f175b42a0d39114
......@@ -82,9 +82,10 @@ fi
# valgrind can not work together with gpertools
# you may want to use this option when you want to run valgrind
if [ "$DISABLE_GPERF" == "YES" ]
then
echo "DISABLE_GPERF=YES"
CMAKE_OPTIONS="$CMAKE_OPTIONS -DENABLE_GPERF=Off"
then
else
echo "DISABLE_GPERF=NO"
fi
......
......@@ -226,7 +226,8 @@ private:
bool parse_compression_types(const std::string &config,
std::vector<rocksdb::CompressionType> &compression_per_level);
bool compression_str_to_type(const std::string &compression_str, rocksdb::CompressionType &type);
bool compression_str_to_type(const std::string &compression_str,
rocksdb::CompressionType &type);
std::string compression_type_to_str(rocksdb::CompressionType type);
// return finish time recorded in rocksdb
......
......@@ -15,7 +15,8 @@ public:
static const uint64_t compacted_ts = 1500000000; // 2017.07.14 10:40:00 CST
public:
manual_compact_service_test() {
manual_compact_service_test()
{
start();
manual_compact_svc = dsn::make_unique<pegasus_manual_compact_service>(_server.get());
}
......
......@@ -60,7 +60,8 @@ public:
return _server->compression_type_to_str(type);
}
void update_app_envs(const std::map<std::string, std::string> &envs) {
void update_app_envs(const std::map<std::string, std::string> &envs)
{
_server->update_app_envs(envs);
}
......@@ -132,7 +133,8 @@ TEST_F(pegasus_compression_options_test, compression_types_convert_fail)
TEST_F(pegasus_compression_options_test, check_rocksdb_compression_types_default)
{
start();
check_db_compression_types({none, none, snappy, snappy, snappy, snappy, snappy}, "start with default");
check_db_compression_types({none, none, snappy, snappy, snappy, snappy, snappy},
"start with default");
}
} // namespace server
......
......@@ -32,7 +32,8 @@ public:
_server = dsn::make_unique<pegasus_server_impl>(_replica);
}
dsn::error_code start(const std::map<std::string, std::string>& envs = {}) {
dsn::error_code start(const std::map<std::string, std::string> &envs = {})
{
std::unique_ptr<char *[]> argvs = dsn::make_unique<char *[]>(envs.size() * 2);
char **argv = argvs.get();
int idx = 0;
......
......@@ -701,4 +701,3 @@ get_app_stat(shell_context *sc, const std::string &app_name, std::vector<row_dat
}
return true;
}
......@@ -63,6 +63,7 @@ struct list_nodes_helper
};
// == miscellaneous (see 'commands/misc.cpp') == //
bool help_info(command_executor *e, shell_context *sc, arguments args);
bool version(command_executor *e, shell_context *sc, arguments args);
......@@ -70,6 +71,7 @@ bool version(command_executor *e, shell_context *sc, arguments args);
bool exit_shell(command_executor *e, shell_context *sc, arguments args);
// == global properties (see 'commands/global_properties.cpp') == //
bool use_app_as_current(command_executor *e, shell_context *sc, arguments args);
bool process_escape_all(command_executor *e, shell_context *sc, arguments args);
......@@ -79,6 +81,7 @@ bool process_timeout(command_executor *e, shell_context *sc, arguments args);
bool cc_command(command_executor *e, shell_context *sc, arguments args);
// == node management (see 'commands/node_management.cpp') == //
bool query_cluster_info(command_executor *e, shell_context *sc, arguments args);
bool ls_nodes(command_executor *e, shell_context *sc, arguments args);
......@@ -92,6 +95,7 @@ bool remote_command(command_executor *e, shell_context *sc, arguments args);
bool flush_log(command_executor *e, shell_context *sc, arguments args);
// == table management (see 'commands/table_management.cpp') == //
bool ls_apps(command_executor *e, shell_context *sc, arguments args);
bool query_app(command_executor *e, shell_context *sc, arguments args);
......@@ -115,6 +119,7 @@ bool del_app_envs(command_executor *e, shell_context *sc, arguments args);
bool clear_app_envs(command_executor *e, shell_context *sc, arguments args);
// == data operations (see 'commands/data_operations.cpp') == //
bool data_operations(command_executor *e, shell_context *sc, arguments args);
bool set_value(command_executor *e, shell_context *sc, arguments args);
......@@ -160,6 +165,7 @@ bool clear_data(command_executor *e, shell_context *sc, arguments args);
bool count_data(command_executor *e, shell_context *sc, arguments args);
// == load balancing(see 'commands/rebalance.cpp') == //
bool set_meta_level(command_executor *e, shell_context *sc, arguments args);
bool get_meta_level(command_executor *e, shell_context *sc, arguments args);
......@@ -169,11 +175,13 @@ bool propose(command_executor *e, shell_context *sc, arguments args);
bool balance(command_executor *e, shell_context *sc, arguments args);
// == data recovery(see 'commands/recovery.cpp') == //
bool recover(command_executor *e, shell_context *sc, arguments args);
bool ddd_diagnose(command_executor *e, shell_context *sc, arguments args);
// == cold backup (see 'commands/cold_backup.cpp') == //
bool add_backup_policy(command_executor *e, shell_context *sc, arguments args);
bool ls_backup_policy(command_executor *e, shell_context *sc, arguments args);
......@@ -191,6 +199,7 @@ bool query_backup_policy(command_executor *e, shell_context *sc, arguments args)
bool query_restore_status(command_executor *e, shell_context *sc, arguments args);
// == debugger (see 'commands/debugger.cpp') == //Debugging tool
bool sst_dump(command_executor *e, shell_context *sc, arguments args);
bool mlog_dump(command_executor *e, shell_context *sc, arguments args);
......
......@@ -67,10 +67,8 @@ bool mlog_dump(command_executor *e, shell_context *sc, arguments args)
std::function<void(int64_t decree, int64_t timestamp, dsn::message_ex * *requests, int count)>
callback;
if (detailed) {
callback = [&os, sc](int64_t decree,
int64_t timestamp,
dsn::message_ex **requests,
int count) mutable {
callback = [&os, sc](
int64_t decree, int64_t timestamp, dsn::message_ex **requests, int count) mutable {
for (int i = 0; i < count; ++i) {
dsn::message_ex *request = requests[i];
dassert(request != nullptr, "");
......
......@@ -25,7 +25,7 @@ cli_remote = false
;aio_factory_name = dsn::tools::native_aio_provider
start_nfs = false
logging_start_level = LOG_LEVEL_INFORMATION
logging_start_level = LOG_LEVEL_DEBUG
logging_factory_name = dsn::tools::simple_logger
;logging_factory_name = dsn::tools::screen_logger
;logging_factory_name = dsn::tools::hpc_logger
......@@ -73,7 +73,7 @@ allow_inline = false
fast_execution_in_network_thread = false
rpc_call_header_format = NET_HDR_DSN
rpc_call_channel = RPC_CHANNEL_TCP
rpc_timeout_milliseconds = 5000
rpc_timeout_milliseconds = 10000
[pegasus.clusters]
@CLUSTER_NAME@ = @CLUSTER_ADDRESS@
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册