[3.8] Fix BTS-539 (#14618)

Dronplane · KVS85 · web-flow · commit cff314c06828 · 2021-08-10T21:21:23.000+03:00
* fix backport

* Update CHANGELOG

Co-authored-by: Vadim &lt;vadim@arangodb.com&gt;
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 v3.8.1 (XXXX-XX-XX)
 -------------------
 
+* 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 possible (but unlikely) crash when killing an AQL query.
+
 * Fixed various problems in GEO_INTERSECTS: wrong results, not implemented cases
   and numerically unstable behaviour. In particular, the case of the
   intersection of two polygons in which one is an S2LngLatRect is fixed
diff --git a/arangod/Aql/Query.cpp b/arangod/Aql/Query.cpp
@@ -182,8 +182,6 @@ Query::~Query() {
                                               << " this: " << (uintptr_t)this;
   }
 
-  _queryProfile.reset(); // unregister from QueryList
-
   // log to audit log
   if (!_queryOptions.skipAudit &&
      (ServerState::instance()->isCoordinator() ||
@@ -204,6 +202,8 @@ Query::~Query() {
     // the destructor
   }
 
+  _queryProfile.reset(); // unregister from QueryList
+
   unregisterSnippets();
 
   exitV8Context();

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,6 @@ Query::~Query() {`
`182`	`182`	`<< " this: " << (uintptr_t)this;`
`183`	`183`	`}`
`184`	`184`
`185`		`- _queryProfile.reset(); // unregister from QueryList`
`186`		`-`
`187`	`185`	`// log to audit log`
`188`	`186`	`if (!_queryOptions.skipAudit &&`
`189`	`187`	`(ServerState::instance()->isCoordinator() \|\|`
`@@ -204,6 +202,8 @@ Query::~Query() {`
`204`	`202`	`// the destructor`
`205`	`203`	`}`
`206`	`204`
	`205`	`+ _queryProfile.reset(); // unregister from QueryList`
	`206`	`+`
`207`	`207`	`unregisterSnippets();`
`208`	`208`
`209`	`209`	`exitV8Context();`