firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:40:38 +01:00
Code Issues

Posfix for #7304: Events in system attachments (like garbage collector) are not traced, do not attempt to attach database from unwindAttach when it failed before complete DBB initialization

Browse Source
This commit is contained in:
AlexPeshkoff 2022-09-20 12:49:57 +03:00
parent d8b9282f47
commit bc2e4dfda0
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/jrd/jrd.cpp
View File

@ -1316,6 +1316,7 @@ namespace {
const unsigned UNWIND_INTERNAL = 1;
const unsigned UNWIND_CREATE = 2;
const unsigned UNWIND_NEW = 4;
}
static VdnResult verifyDatabaseName(const PathName&, FbStatusVector*, bool);
@ -1538,7 +1539,7 @@ static void trace_warning(thread_db* tdbb, FbStatusVector* userStatus, const cha
// Report to Trace API that attachment has not been created
static void trace_failed_attach(const char* filename, const DatabaseOptions& options,
bool create, FbStatusVector* status, ICryptKeyCallback* callback)
unsigned flags, FbStatusVector* status, ICryptKeyCallback* callback)
{
// Avoid uncontrolled recursion
if (options.dpb_map_attach)
@ -1555,13 +1556,13 @@ static void trace_failed_attach(const char* filename, const DatabaseOptions& opt
ISC_STATUS s = status->getErrors()[1];
const ntrace_result_t result = (s == isc_login || s == isc_no_priv) ?
ITracePlugin::RESULT_UNAUTHORIZED : ITracePlugin::RESULT_FAILED;
const char* func = create ? "JProvider::createDatabase" : "JProvider::attachDatabase";
const char* func = flags & UNWIND_CREATE ? "JProvider::createDatabase" : "JProvider::attachDatabase";
// Perform actual trace
TraceManager tempMgr(origFilename, callback);
TraceManager tempMgr(origFilename, callback, flags & UNWIND_NEW);
if (tempMgr.needs(ITraceFactory::TRACE_EVENT_ATTACH))
tempMgr.event_attach(&conn, create, result);
tempMgr.event_attach(&conn, flags & UNWIND_CREATE, result);
if (tempMgr.needs(ITraceFactory::TRACE_EVENT_ERROR))
tempMgr.event_error(&conn, &traceStatus, func);
@ -1687,7 +1688,7 @@ JAttachment* JProvider::internalAttach(CheckStatusWrapper* user_status, const ch
catch (const Exception& ex)
{
ex.stuffException(user_status);
trace_failed_attach(filename, options, false, user_status, cryptCallback);
trace_failed_attach(filename, options, 0, user_status, cryptCallback);
throw;
}
@ -1695,7 +1696,7 @@ JAttachment* JProvider::internalAttach(CheckStatusWrapper* user_status, const ch
const VdnResult vdn = verifyDatabaseName(expanded_name, tdbb->tdbb_status_vector, is_alias);
if (!is_alias && vdn == VDN_FAIL)
{
trace_failed_attach(filename, options, false, tdbb->tdbb_status_vector, cryptCallback);
trace_failed_attach(filename, options, 0, tdbb->tdbb_status_vector, cryptCallback);
status_exception::raise(tdbb->tdbb_status_vector);
}
@ -2848,7 +2849,7 @@ JAttachment* JProvider::createDatabase(CheckStatusWrapper* user_status, const ch
catch (const Exception& ex)
{
ex.stuffException(user_status);
trace_failed_attach(filename, options, true, user_status, cryptCallback);
trace_failed_attach(filename, options, UNWIND_CREATE, user_status, cryptCallback);
throw;
}
@ -2856,7 +2857,7 @@ JAttachment* JProvider::createDatabase(CheckStatusWrapper* user_status, const ch
const VdnResult vdn = verifyDatabaseName(expanded_name, tdbb->tdbb_status_vector, is_alias);
if (!is_alias && vdn == VDN_FAIL)
{
trace_failed_attach(filename, options, true, tdbb->tdbb_status_vector, cryptCallback);
trace_failed_attach(filename, options, UNWIND_CREATE, tdbb->tdbb_status_vector, cryptCallback);
status_exception::raise(tdbb->tdbb_status_vector);
}
@ -8645,14 +8646,14 @@ static void unwindAttach(thread_db* tdbb, const char* filename, const Exception&
else
{
auto dbb = tdbb->getDatabase();
/* if (dbb && (dbb->dbb_flags & DBB_new))
if (dbb && (dbb->dbb_flags & DBB_new))
{
// attach failed before completion of DBB initialization
// that's hardly recoverable error - avoid extra problems in mapping
dbb->dbb_flags |= DBB_bugcheck;
flags |= UNWIND_NEW;
}
*******/
trace_failed_attach(filename, options, flags & UNWIND_CREATE, userStatus, callback);
trace_failed_attach(filename, options, flags, userStatus, callback);
}
const char* func = flags & UNWIND_CREATE ? "JProvider::createDatabase" : "JProvider::attachDatabase";

10
src/jrd/trace/TraceManager.cpp
View File

@ -106,13 +106,14 @@ TraceManager::TraceManager(Service* in_svc) :
init();
}
TraceManager::TraceManager(const char* in_filename, ICryptKeyCallback* cb) :
TraceManager::TraceManager(const char* in_filename, ICryptKeyCallback* cb, bool failed) :
attachment(NULL),
service(NULL),
filename(in_filename),
callback(cb),
trace_sessions(*getDefaultMemoryPool()),
active(true)
active(true),
failedAttach(failed)
{
init();
}
@ -286,6 +287,8 @@ void TraceManager::update_session(const TraceSession& session)
mapping.setAuthBlock(session.ses_auth);
mapping.setSqlRole(session.ses_role);
mapping.setSecurityDbAlias(dbb->dbb_config->getSecurityDatabase(), dbb->dbb_filename.c_str());
fb_assert(attachment->getInterface());
mapping.setDb(attachment->att_filename.c_str(), dbb->dbb_filename.c_str(),
attachment->getInterface());
@ -328,7 +331,8 @@ void TraceManager::update_session(const TraceSession& session)
expanded_name = filename;
mapping.setSecurityDbAlias(config->getSecurityDatabase(), expanded_name.c_str());
mapping.setDb(filename, expanded_name.c_str(), nullptr);
if (!failedAttach)
mapping.setDb(filename, expanded_name.c_str(), nullptr);
mapResult = mapping.mapUser(s_user, t_role);
}

4
src/jrd/trace/TraceManager.h
View File

@ -59,7 +59,7 @@ public:
/* Initializes plugins. */
explicit TraceManager(Attachment* in_att);
explicit TraceManager(Service* in_svc);
TraceManager(const char* in_filename, Firebird::ICryptKeyCallback* callback);
TraceManager(const char* in_filename, Firebird::ICryptKeyCallback* callback, bool failedAttach);
/* Finalize plugins. Called when database is closed by the engine */
~TraceManager();
@ -265,7 +265,7 @@ private:
static Firebird::GlobalPtr<StorageInstance, Firebird::InstanceControl::PRIORITY_DELETE_FIRST> storageInstance;
ULONG changeNumber;
bool active;
bool active, failedAttach;
};
}