4ffc39d885
Currently we hold group0_guard only during DDL statement's execute() function, but unfortunately some statements access underlying schema state also during check_access() and validate() calls which are called by the query_processor before it calls execute. We need to cover those calls with group0_guard as well and also move retry loop up. This patch does it by introducing new function to cql_statement class take_guard(). Schema altering statements return group0 guard while others do not return any guard. Query processor takes this guard at the beginning of a statement execution and retries if service::group0_concurrent_modification is thrown. The guard is passed to the execute in query_state structure. Fixes: #13942 Message-ID: <ZNsynXayKim2XAFr@scylladb.com>
35 lines
1.5 KiB
C++
35 lines
1.5 KiB
C++
/*
|
|
* Copyright 2016-present ScyllaDB
|
|
*
|
|
* Modified by ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
|
|
*/
|
|
|
|
#include "grant_statement.hh"
|
|
#include "auth/authorizer.hh"
|
|
#include "cql3/statements/prepared_statement.hh"
|
|
#include "service/query_state.hh"
|
|
|
|
std::unique_ptr<cql3::statements::prepared_statement> cql3::statements::grant_statement::prepare(
|
|
data_dictionary::database db, cql_stats& stats) {
|
|
return std::make_unique<prepared_statement>(::make_shared<grant_statement>(*this));
|
|
}
|
|
|
|
future<::shared_ptr<cql_transport::messages::result_message>>
|
|
cql3::statements::grant_statement::execute(query_processor&, service::query_state& state, const query_options& options, std::optional<service::group0_guard> guard) const {
|
|
auto& auth_service = *state.get_client_state().get_auth_service();
|
|
|
|
return auth::grant_permissions(auth_service, _role_name, _permissions, _resource).then([] {
|
|
return make_ready_future<::shared_ptr<cql_transport::messages::result_message>>();
|
|
}).handle_exception_type([](const auth::nonexistant_role& e) {
|
|
return make_exception_future<::shared_ptr<cql_transport::messages::result_message>>(
|
|
exceptions::invalid_request_exception(e.what()));
|
|
}).handle_exception_type([](const auth::unsupported_authorization_operation& e) {
|
|
return make_exception_future<::shared_ptr<cql_transport::messages::result_message>>(
|
|
exceptions::invalid_request_exception(e.what()));
|
|
});
|
|
}
|