bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

streaming: Rename get_or_create_next_session to get_or_create_session

Browse Source 
There is only one session for each peer in stream_coordinator.
This commit is contained in:
Asias He
2016-01-22 16:47:56 +08:00
parent e46d4166f2
commit dc94c5e42e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
streaming/stream_coordinator.hh
View File

@@ -86,7 +86,7 @@ public:
std::set<inet_address> get_peers();
public:
shared_ptr<stream_session> get_or_create_next_session(inet_address peer) {
shared_ptr<stream_session> get_or_create_session(inet_address peer) {
return get_or_create_host_data(peer).get_or_create_session(peer);
}

4
streaming/stream_plan.cc
View File

@@ -50,7 +50,7 @@ stream_plan& stream_plan::request_ranges(inet_address from, sstring keyspace, st
stream_plan& stream_plan::request_ranges(inet_address from, sstring keyspace, std::vector<query::range<token>> ranges, std::vector<sstring> column_families) {
_range_added = true;
auto session = _coordinator->get_or_create_next_session(from);
auto session = _coordinator->get_or_create_session(from);
session->add_stream_request(keyspace, ranges, std::move(column_families));
return *this;
}
@@ -61,7 +61,7 @@ stream_plan& stream_plan::transfer_ranges(inet_address to, sstring keyspace, std
stream_plan& stream_plan::transfer_ranges(inet_address to, sstring keyspace, std::vector<query::range<token>> ranges, std::vector<sstring> column_families) {
_range_added = true;
auto session = _coordinator->get_or_create_next_session(to);
auto session = _coordinator->get_or_create_session(to);
session->add_transfer_ranges(keyspace, std::move(ranges), std::move(column_families), _flush_before_transfer);
return *this;
}

10
streaming/stream_session.cc
View File

@@ -94,7 +94,7 @@ void stream_session::init_messaging_service_handler() {
if (f) {
auto coordinator = f->get_coordinator();
assert(coordinator);
auto session = coordinator->get_or_create_next_session(from);
auto session = coordinator->get_or_create_session(from);
assert(session);
session->init(f);
session->dst_cpu_id = src_cpu_id;
@@ -117,7 +117,7 @@ void stream_session::init_messaging_service_handler() {
if (f) {
auto coordinator = f->get_coordinator();
assert(coordinator);
auto session = coordinator->get_or_create_next_session(from);
auto session = coordinator->get_or_create_session(from);
assert(session);
session->start_keep_alive_timer();
session->follower_start_sent();
@@ -140,7 +140,7 @@ void stream_session::init_messaging_service_handler() {
if (f) {
auto coordinator = f->get_coordinator();
assert(coordinator);
auto session = coordinator->get_or_create_next_session(from.addr);
auto session = coordinator->get_or_create_session(from.addr);
assert(session);
session->start_keep_alive_timer();
return service::get_schema_for_write(fm.schema_version(), from).then([&fm] (schema_ptr s) {
@@ -161,7 +161,7 @@ void stream_session::init_messaging_service_handler() {
if (f) {
auto coordinator = f->get_coordinator();
assert(coordinator);
auto session = coordinator->get_or_create_next_session(from);
auto session = coordinator->get_or_create_session(from);
assert(session);
session->start_keep_alive_timer();
session->receive_task_completed(cf_id);
@@ -186,7 +186,7 @@ void stream_session::init_messaging_service_handler() {
if (f) {
auto coordinator = f->get_coordinator();
assert(coordinator);
auto session = coordinator->get_or_create_next_session(from);
auto session = coordinator->get_or_create_session(from);
assert(session);
session->start_keep_alive_timer();
session->complete();