Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion console/executor_options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 7 additions & 1 deletion console/executor_store.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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()));

Expand Down
4 changes: 4 additions & 0 deletions console/localize.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading