cql_test_env: Start the global snitch before storage service

This order is required since 5e1348e741
(storage_service: Use get_local_snitch_ptr in gossip_snitch_info).

This fixes the breakage in the cql_query_test.

Reported-by: Asias He <asias@cloudius-systems.com>
Signed-off-by: Vlad Zolotarov <vladz@cloudius-systems.com>
This commit is contained in:
Vlad Zolotarov
2015-06-23 16:32:41 +03:00
committed by Avi Kivity
parent 20b86ea839
commit efe1696410

View File

@@ -197,9 +197,8 @@ future<> init_once() {
}
future<::shared_ptr<cql_test_env>> make_env_for_test() {
return init_once().then([] {
using namespace locator;
return i_endpoint_snitch::create_snitch("org.apache.cassandra.locator.SimpleSnitch").then([] {
return locator::i_endpoint_snitch::create_snitch("SimpleSnitch").then([] {
return init_once().then([] {
auto db = ::make_shared<distributed<database>>();
auto cfg = make_lw_shared<db::config>();
cfg->data_file_directories() = {};