9be42bfd7b
The upstream of origin adds the version to the application_state in the get_endpoints in the failure detector. In our implementation we return an object to the jmx proxy and the proxy do the string formatting. This patch adds the version to the return object which is both useful as an API and will allow the jmx proxy to add it to its output when we move forward with the jmx version. Signed-off-by: Amnon Heiman <amnon@scylladb.com> Message-Id: <1448962889-19611-1-git-send-email-amnon@scylladb.com>
95 lines
3.7 KiB
C++
95 lines
3.7 KiB
C++
/*
|
|
* Copyright 2015 Cloudius Systems
|
|
*/
|
|
|
|
/*
|
|
* This file is part of Scylla.
|
|
*
|
|
* Scylla is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Scylla is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "failure_detector.hh"
|
|
#include "api/api-doc/failure_detector.json.hh"
|
|
#include "gms/failure_detector.hh"
|
|
#include "gms/application_state.hh"
|
|
#include "gms/gossiper.hh"
|
|
namespace api {
|
|
|
|
namespace fd = httpd::failure_detector_json;
|
|
|
|
void set_failure_detector(http_context& ctx, routes& r) {
|
|
fd::get_all_endpoint_states.set(r, [](std::unique_ptr<request> req) {
|
|
std::vector<fd::endpoint_state> res;
|
|
for (auto i : gms::get_local_gossiper().endpoint_state_map) {
|
|
fd::endpoint_state val;
|
|
val.addrs = boost::lexical_cast<std::string>(i.first);
|
|
val.is_alive = i.second.is_alive();
|
|
val.generation = i.second.get_heart_beat_state().get_generation();
|
|
val.version = i.second.get_heart_beat_state().get_heart_beat_version();
|
|
val.update_time = i.second.get_update_timestamp().time_since_epoch().count();
|
|
for (auto a : i.second.get_application_state_map()) {
|
|
fd::version_value version_val;
|
|
// We return the enum index and not it's name to stay compatible to origin
|
|
// method that the state index are static but the name can be changed.
|
|
version_val.application_state = static_cast<std::underlying_type<gms::application_state>::type>(a.first);
|
|
version_val.value = a.second.value;
|
|
version_val.version = a.second.version;
|
|
val.application_state.push(version_val);
|
|
}
|
|
res.push_back(val);
|
|
}
|
|
return make_ready_future<json::json_return_type>(res);
|
|
});
|
|
|
|
fd::get_up_endpoint_count.set(r, [](std::unique_ptr<request> req) {
|
|
return gms::get_up_endpoint_count().then([](int res) {
|
|
return make_ready_future<json::json_return_type>(res);
|
|
});
|
|
});
|
|
|
|
fd::get_down_endpoint_count.set(r, [](std::unique_ptr<request> req) {
|
|
return gms::get_down_endpoint_count().then([](int res) {
|
|
return make_ready_future<json::json_return_type>(res);
|
|
});
|
|
});
|
|
|
|
fd::get_phi_convict_threshold.set(r, [] (std::unique_ptr<request> req) {
|
|
return gms::get_phi_convict_threshold().then([](double res) {
|
|
return make_ready_future<json::json_return_type>(res);
|
|
});
|
|
});
|
|
|
|
fd::get_simple_states.set(r, [] (std::unique_ptr<request> req) {
|
|
return gms::get_simple_states().then([](const std::map<sstring, sstring>& map) {
|
|
return make_ready_future<json::json_return_type>(map_to_key_value<fd::mapper>(map));
|
|
});
|
|
});
|
|
|
|
fd::set_phi_convict_threshold.set(r, [](std::unique_ptr<request> req) {
|
|
double phi = atof(req->get_query_param("phi").c_str());
|
|
return gms::set_phi_convict_threshold(phi).then([]() {
|
|
return make_ready_future<json::json_return_type>("");
|
|
});
|
|
});
|
|
|
|
fd::get_endpoint_state.set(r, [](std::unique_ptr<request> req) {
|
|
return gms::get_endpoint_state(req->param["addr"]).then([](const sstring& state) {
|
|
return make_ready_future<json::json_return_type>(state);
|
|
});
|
|
});
|
|
}
|
|
|
|
}
|
|
|