Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix standalone version's compile #5455

Merged
merged 1 commit into from
Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/daemons/StandAloneDaemon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,11 @@ int main(int argc, char *argv[]) {
return;
}

auto handler =
std::make_shared<nebula::meta::MetaServiceHandler>(gMetaKVStore.get(), metaClusterId());
{
nebula::meta::JobManager *jobMgr = nebula::meta::JobManager::getInstance();
if (!jobMgr->init(gMetaKVStore.get())) {
if (!jobMgr->init(gMetaKVStore.get(), handler->getAdminClient())) {
LOG(ERROR) << "Init job manager failed";
return;
}
Expand All @@ -229,8 +231,6 @@ int main(int argc, char *argv[]) {
return;
}

auto handler =
std::make_shared<nebula::meta::MetaServiceHandler>(gMetaKVStore.get(), metaClusterId());
LOG(INFO) << "The meta daemon start on " << metaLocalhost;
try {
gMetaServer = std::make_unique<apache::thrift::ThriftServer>();
Expand Down
12 changes: 7 additions & 5 deletions src/storage/StorageServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,23 @@
DEFINE_int32(port, 44500, "Storage daemon listening port");
DEFINE_int32(num_worker_threads, 32, "Number of workers");
DEFINE_bool(local_config, true, "meta client will not retrieve latest configuration from meta");
DEFINE_int32(check_memory_interval_in_secs, 1, "Memory check interval in seconds");
DEFINE_uint32(num_max_connections,
0,
"Max active connections for all networking threads. 0 means no limit. Max active "
"connections for each networking thread = num_max_connections / num_netio_threads");
#else
DEFINE_int32(storage_port, 44501, "Storage daemon listening port");
DEFINE_int32(storage_num_worker_threads, 32, "Number of workers");
DECLARE_bool(local_config);
DEFINE_bool(add_local_host, true, "Whether add localhost automatically");
DECLARE_string(local_ip);
DECLARE_int32(check_memory_interval_in_secs);
DECLARE_int32(num_max_connections);
#endif
DEFINE_bool(storage_kv_mode, false, "True for kv mode");
DEFINE_int32(num_io_threads, 16, "Number of IO threads");
DEFINE_uint32(num_max_connections,
0,
"Max active connections for all networking threads. 0 means no limit. Max active "
"connections for each networking thread = num_max_connections / num_netio_threads");
DEFINE_int32(storage_http_thread_num, 3, "Number of storage daemon's http thread");
DEFINE_int32(check_memory_interval_in_secs, 1, "Memory check interval in seconds");

namespace nebula {
namespace storage {
Expand Down