storage_service: Remove ad-hoc token_metadata creation

Use token_metadata from storage_service when creating a replication_strategy in keyspace::create_replication_strategy.
scylladb · Jun 4, 2015 · a19d217 · a19d217
1 parent f1ed0cd
commit a19d217
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/database.cc b/database.cc
@@ -29,6 +29,7 @@
 #include "frozen_mutation.hh"
 #include "mutation_partition_applier.hh"
 #include "core/do_with.hh"
+#include "service/storage_service.hh"
 
 thread_local logging::logger dblog("database");
 
@@ -684,20 +685,10 @@ const column_family& database::find_column_family(const utils::UUID& uuid) const
 
 void
 keyspace::create_replication_strategy() {
-    static thread_local locator::token_metadata tm;
     static locator::simple_snitch snitch;
     static std::unordered_map<sstring, sstring> options = {{"replication_factor", "3"}};
-    auto d2t = [](double d) {
-        unsigned long l = net::hton(static_cast<unsigned long>(d*(std::numeric_limits<unsigned long>::max())));
-        std::array<int8_t, 8> a;
-        memcpy(a.data(), &l, 8);
-        return a;
-    };
-    tm.update_normal_token({dht::token::kind::key, {d2t(0).data(), 8}}, to_sstring("127.0.0.1"));
-    tm.update_normal_token({dht::token::kind::key, {d2t(1.0/4).data(), 8}}, to_sstring("127.0.0.2"));
-    tm.update_normal_token({dht::token::kind::key, {d2t(2.0/4).data(), 8}}, to_sstring("127.0.0.3"));
-    tm.update_normal_token({dht::token::kind::key, {d2t(3.0/4).data(), 8}}, to_sstring("127.0.0.4"));
-    _replication_strategy = locator::abstract_replication_strategy::create_replication_strategy(_metadata->name(), _metadata->strategy_name(), tm, snitch, options);
+    auto& ss = service::get_local_storage_service();
+    _replication_strategy = locator::abstract_replication_strategy::create_replication_strategy(_metadata->name(), _metadata->strategy_name(), ss.get_token_metadata(), snitch, options);
 }
 
 locator::abstract_replication_strategy&

diff --git a/service/storage_service.hh b/service/storage_service.hh
@@ -65,7 +65,7 @@ class storage_service : public gms::i_endpoint_state_change_subscriber
 public:
     static int RING_DELAY; // delay after which we assume ring has stablized
 
-    const locator::token_metadata& get_token_metadata() const {
+    locator::token_metadata& get_token_metadata() {
         return _token_metadata;
     }
 private: