8df5aa7b0c
There are various call-sites that explicitly check for EEXIST and
ENOENT:
$ git grep "std::error_code(E"
database.cc: if (e.code() != std::error_code(EEXIST, std::system_category())) {
database.cc: if (e.code() != std::error_code(ENOENT, std::system_category())) {
database.cc: if (e.code() != std::error_code(ENOENT, std::system_category())) {
database.cc: if (e.code() != std::error_code(ENOENT, std::system_category())) {
sstables/sstables.cc: if (e.code() == std::error_code(ENOENT, std::system_category())) {
sstables/sstables.cc: if (e.code() == std::error_code(ENOENT, std::system_category())) {
Commit 961e80a ("Be more conservative when deciding when to shut down
due to disk errors") turned these errors into a storage_io_exception
that is not expected by the callers, which causes 'nodetool snapshot'
functionality to break, for example.
Whitelist the two error codes to revert back to the old behavior of
io_check().
Message-Id: <1465454446-17954-1-git-send-email-penberg@scylladb.com>
66 lines
1.7 KiB
C++
66 lines
1.7 KiB
C++
/*
|
|
* Copyright 2015 ScyllaDB
|
|
*/
|
|
|
|
/* 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 <exception>
|
|
#include <system_error>
|
|
#include "exceptions.hh"
|
|
|
|
#include <iostream>
|
|
|
|
bool check_exception(system_error_lambda_t f)
|
|
{
|
|
auto e = std::current_exception();
|
|
if (!e) {
|
|
return false;
|
|
}
|
|
|
|
try {
|
|
std::rethrow_exception(e);
|
|
} catch (std::system_error &e) {
|
|
return f(e);
|
|
} catch (...) {
|
|
return false;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool is_system_error_errno(int err_no)
|
|
{
|
|
return check_exception([err_no] (const std::system_error &e) {
|
|
auto code = e.code();
|
|
return code.value() == err_no &&
|
|
code.category() == std::system_category();
|
|
});
|
|
}
|
|
|
|
bool should_stop_on_system_error(const std::system_error& e) {
|
|
if (e.code().category() == std::system_category()) {
|
|
// Whitelist of errors that don't require us to stop the server:
|
|
switch (e.code().value()) {
|
|
case EEXIST:
|
|
case ENOENT:
|
|
return false;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
return true;
|
|
}
|