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

storage_service: add MAINTENANCE option to mode enum

Browse Source 
join_cluster and start_maintenance_mode are incompatible.
To make sure that only one is called when the node starts, add the MAINTENANCE option.

start_maintenance_mode sets _operation_mode to MAINTENANCE.
join_cluster sets _operation_mode to STARTING.

set_mode will result in an internal error if:
* it tries to set MAINTENANCE mode when the _operation_mode is other than NONE,
  i.e. start_maintenance_mode is called after join_cluster (or it is called during
  the drain, but it also shouldn't happen).
* it tries to set STARTING mode when the mode is set to MAINTENANCE,
  i.e. join_cluster is called after start_maintenance_mode.
This commit is contained in:
Mikołaj Grzebieluch
2024-01-19 16:41:38 +01:00
parent d4c22fc86c
commit c530756837
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/storage_service.cc
View File

@@ -1001,7 +1001,7 @@ void set_storage_service(http_context& ctx, routes& r, sharded<service::storage_
ss::is_initialized.set(r, [&ss](std::unique_ptr<http::request> req) {
return ss.local().get_operation_mode().then([&ss] (auto mode) {
bool is_initialized = mode >= service::storage_service::mode::STARTING;
bool is_initialized = mode >= service::storage_service::mode::STARTING && mode != service::storage_service::mode::MAINTENANCE;
if (mode == service::storage_service::mode::NORMAL) {
is_initialized = ss.local().gossiper().is_enabled();
}
@@ -1015,7 +1015,7 @@ void set_storage_service(http_context& ctx, routes& r, sharded<service::storage_
ss::is_joined.set(r, [&ss] (std::unique_ptr<http::request> req) {
return ss.local().get_operation_mode().then([] (auto mode) {
return make_ready_future<json::json_return_type>(mode >= service::storage_service::mode::JOINING);
return make_ready_future<json::json_return_type>(mode >= service::storage_service::mode::JOINING && mode != service::storage_service::mode::MAINTENANCE);
});
});

15
service/storage_service.cc
View File

@@ -175,7 +175,8 @@ enum class node_external_status {
DECOMMISSIONED = 5,
DRAINING = 6,
DRAINED = 7,
MOVING = 8 //deprecated
MOVING = 8, //deprecated
MAINTENANCE = 9
};
static node_external_status map_operation_mode(storage_service::mode m) {
@@ -190,6 +191,7 @@ static node_external_status map_operation_mode(storage_service::mode m) {
case storage_service::mode::DRAINING: return node_external_status::DRAINING;
case storage_service::mode::DRAINED: return node_external_status::DRAINED;
case storage_service::mode::MOVING: return node_external_status::MOVING;
case storage_service::mode::MAINTENANCE: return node_external_status::MAINTENANCE;
}
return node_external_status::UNKNOWN;
}
@@ -203,7 +205,7 @@ void storage_service::register_metrics() {
namespace sm = seastar::metrics;
_metrics.add_group("node", {
sm::make_gauge("operation_mode", sm::description("The operation mode of the current node. UNKNOWN = 0, STARTING = 1, JOINING = 2, NORMAL = 3, "
"LEAVING = 4, DECOMMISSIONED = 5, DRAINING = 6, DRAINED = 7, MOVING = 8"), [this] {
"LEAVING = 4, DECOMMISSIONED = 5, DRAINING = 6, DRAINED = 7, MOVING = 8, MAINTENANCE = 9"), [this] {
return static_cast<std::underlying_type_t<node_external_status>>(map_operation_mode(_operation_mode));
}),
});
@@ -2797,6 +2799,15 @@ future<std::map<gms::inet_address, float>> storage_service::effective_ownership(
}
void storage_service::set_mode(mode m) {
if (m == mode::MAINTENANCE && _operation_mode != mode::NONE) {
// Prevent from calling `start_maintenance_mode` after `join_cluster`.
on_fatal_internal_error(slogger, format("Node should enter maintenance mode only from mode::NONE (current mode: {})", _operation_mode));
}
if (m == mode::STARTING && _operation_mode == mode::MAINTENANCE) {
// Prevent from calling `join_cluster` after `start_maintenance_mode`.
on_fatal_internal_error(slogger, "Node in the maintenance mode cannot enter the starting mode");
}
if (m != _operation_mode) {
slogger.info("entering {} mode", m);
_operation_mode = m;

3
service/storage_service.hh
View File

@@ -283,7 +283,7 @@ private:
public:
std::chrono::milliseconds get_ring_delay();
enum class mode { NONE, STARTING, JOINING, BOOTSTRAP, NORMAL, LEAVING, DECOMMISSIONED, MOVING, DRAINING, DRAINED };
enum class mode { NONE, STARTING, JOINING, BOOTSTRAP, NORMAL, LEAVING, DECOMMISSIONED, MOVING, DRAINING, DRAINED, MAINTENANCE };
private:
mode _operation_mode = mode::NONE;
/* Used for tracking drain progress */
@@ -837,6 +837,7 @@ struct fmt::formatter<service::storage_service::mode> : fmt::formatter<std::stri
case MOVING: name = "MOVING"; break;
case DRAINING: name = "DRAINING"; break;
case DRAINED: name = "DRAINED"; break;
case MAINTENANCE: name = "MAINTENANCE"; break;
}
return fmt::format_to(ctx.out(), "{}", name);
}