diff --git a/console/executor_options.cpp b/console/executor_options.cpp index 1e9695d1..f1610f2b 100644 --- a/console/executor_options.cpp +++ b/console/executor_options.cpp @@ -163,7 +163,7 @@ void executor::do_resume() return; } - if (query_.is_fault()) + if (query_.is_fault() || query_.is_fault_locked()) { logger(BS_NODE_UNRECOVERABLE); return; diff --git a/console/executor_store.cpp b/console/executor_store.cpp index e21fc483..657152f1 100644 --- a/console/executor_store.cpp +++ b/console/executor_store.cpp @@ -144,7 +144,11 @@ code executor::open_store_coded(bool details) server_node::store::tables.at(table))); })) { - logger(std::format(BS_DATABASE_START_FAIL, ec.message())); + if (ec == database::error::fault_lock) + logger(BS_DATABASE_FAULT_LOCK); + else + logger(std::format(BS_DATABASE_START_FAIL, ec.message())); + return ec; } @@ -235,6 +239,8 @@ bool executor::restore_store(bool details) { if (ec == database::error::flush_lock) logger(BS_RESTORE_MISSING_FLUSH_LOCK); + else if (ec == database::error::fault_lock) + logger(BS_DATABASE_FAULT_LOCK); else logger(std::format(BS_RESTORE_FAILURE, ec.message())); diff --git a/console/localize.hpp b/console/localize.hpp index 04cf594f..1e85be6d 100644 --- a/console/localize.hpp +++ b/console/localize.hpp @@ -362,6 +362,10 @@ "The {} database directory does not exist." #define BS_UNINITIALIZED_CHAIN \ "The {} database is not initialized, delete and retry." +#define BS_DATABASE_FAULT_LOCK \ + "The application (or underlying operating system or hardware) " \ + "produced an unrecoverable error prior to shutdown. The cause is not " \ + "knowable to the application." #define BS_DATABASE_START_FAIL \ "Database failed to start with error '{}'." #define BS_DATABASE_SCHEMA_FAIL \