From 05edcf3b7fa5f5ab1dd461de84f75f64647e56ae Mon Sep 17 00:00:00 2001 From: Andrei Lobov Date: Mon, 9 Aug 2021 18:26:16 +0300 Subject: [PATCH 1/3] move profileQuery unregistering after the sync --- arangod/Aql/Query.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arangod/Aql/Query.cpp b/arangod/Aql/Query.cpp index 0fc52b6017a1..156ada564b4f 100644 --- a/arangod/Aql/Query.cpp +++ b/arangod/Aql/Query.cpp @@ -186,8 +186,6 @@ Query::~Query() { << " this: " << (uintptr_t)this; } - _queryProfile.reset(); // unregister from QueryList - // log to audit log if (!_queryOptions.skipAudit && (ServerState::instance()->isCoordinator() || @@ -208,6 +206,8 @@ Query::~Query() { // the destructor } + _queryProfile.reset(); // unregister from QueryList + unregisterSnippets(); exitV8Context(); From f95cc0612d91bd1e41aca9f4723c82d0c555b831 Mon Sep 17 00:00:00 2001 From: Andrei Lobov Date: Tue, 10 Aug 2021 11:16:14 +0300 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 97920ffef733..02752f312358 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ devel ----- +* Fixed issue BTS-539 "Unsynchronized query kill while it's being finalized in + another thread was uncovered through `test-kill.js` of `communication_ssl` suite" + Fixed sync of query profiler releasing with shutdown state changing in Query dtor + * Fixed issue BTS-536 "Upgrading without rest-server is aborted by error". Now stating `--server.rest-server false` does not require the additional `--console` argument for upgrading a server. From 7d65c3a4ca2a34e6c8adfeca9b2619be1a6f15da Mon Sep 17 00:00:00 2001 From: Andrei Lobov Date: Tue, 10 Aug 2021 16:14:58 +0300 Subject: [PATCH 3/3] address review comments --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 9b1a2fe6753e..61bbb9fc9332 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,7 @@ devel * Fixed issue BTS-539 "Unsynchronized query kill while it's being finalized in another thread was uncovered through `test-kill.js` of `communication_ssl` suite" - Fixed sync of query profiler releasing with shutdown state changing in Query dtor + Fixed possible (but unlikely) crash when killing an AQL query. * Change optimization level for debug builds back to `-O0` (from `-Og`) because `-Og` seems to cause debuggability issues in some environments.