mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-09 16:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix gossip test" from Asias

Browse Source
This commit is contained in:
Avi Kivity
2015-10-28 12:59:19 +02:00
parent 5aab69e72f 25c898fe9c
commit 4d23712c9c
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gms/failure_detector.cc
View File

@@ -269,7 +269,6 @@ void failure_detector::unregister_failure_detection_event_listener(i_failure_det
}
std::ostream& operator<<(std::ostream& os, const failure_detector& x) {
os << "----------- failure_detector: -----------\n";
for (auto& entry : x._arrival_samples) {
const inet_address& ep = entry.first;
const arrival_window& win = entry.second;

3
gms/gossiper.cc
View File

@@ -419,7 +419,7 @@ void gossiper::remove_endpoint(inet_address endpoint) {
if(_seeds.count(endpoint)) {
build_seeds_list();
_seeds.erase(endpoint);
// logger.info("removed {} from _seeds, updated _seeds list = {}", endpoint, _seeds);
logger.info("removed {} from _seeds, updated _seeds list = {}", endpoint, _seeds);
}
_live_endpoints.erase(endpoint);
@@ -526,6 +526,7 @@ void gossiper::run() {
gossipedToSeed check.
See CASSANDRA-150 for more exposition. */
logger.trace("gossiped_to_seed={}, _live_endpoints.size={}, _seeds.size={}", gossiped_to_seed, _live_endpoints.size(), _seeds.size());
if (!gossiped_to_seed || _live_endpoints.size() < _seeds.size()) {
do_gossip_to_seed(message).get();
}

16
tests/gossip.cc
View File

@@ -27,6 +27,8 @@
#include "gms/gossiper.hh"
#include "gms/application_state.hh"
#include "service/storage_service.hh"
#include "utils/fb_utilities.hh"
#include "locator/snitch_base.hh"
#include "log.hh"
#include <chrono>
@@ -42,8 +44,11 @@ int main(int ac, char ** av) {
auto config = app.configuration();
logging::logger_registry().set_logger_level("gossip", logging::log_level::trace);
const gms::inet_address listen = gms::inet_address(config["listen-address"].as<std::string>());
utils::fb_utilities::set_broadcast_address(listen);
auto vv = std::make_shared<gms::versioned_value::factory>();
service::init_storage_service(db).then([vv, listen, config] {
locator::i_endpoint_snitch::create_snitch("SimpleSnitch").then([&db] {
return service::init_storage_service(db);
}).then([vv, listen, config] {
return net::get_messaging_service().start(listen);
}).then([config] {
auto& server = net::get_local_messaging_service();
@@ -73,15 +78,6 @@ int main(int ac, char ** av) {
int generation_number = duration_cast<seconds>(now).count();
return gossiper.start(generation_number, app_states);
}).then([vv] {
auto reporter = std::make_shared<timer<lowres_clock>>();
reporter->set_callback ([reporter] {
auto& gossiper = gms::get_local_gossiper();
gossiper.dump_endpoint_state_map();
auto& fd = gms::get_local_failure_detector();
print("%s", fd);
});
reporter->arm_periodic(std::chrono::milliseconds(1000));
auto app_state_adder = std::make_shared<timer<lowres_clock>>();
app_state_adder->set_callback ([vv, app_state_adder] {
static double load = 0.5;