Fix query counter gauge #21785
Fix query counter gauge #21785
Conversation
arangod/Aql/Query.cpp
Outdated
| auto& queryRegistryFeature = | ||
| vocbase().server().getFeature<QueryRegistryFeature>(); | ||
| queryRegistryFeature.trackQueryStart(); | ||
| _isExecuting = true; |
There was a problem hiding this comment.
I think moving it out of instantiatePlan() is a good idea. More than that, I think it was actually incorrect before and only called in certain situations. But here is not the right place to call it, either:
The name of the function (execute()) is somewhat misleading: it contains everything from parsing, optimization, instantiation, execution and cleanup. The execution part happens below in case ExecutionPhase::EXECUTE:. But note that this function is also reentrant due to the WAITING mechanism, so it will be called multiple times (possibly a lot) during the execution of a query.
Also, there's executeV8(), which is basically a re-implementation called from V8 contexts (e.g. Foxx microservices); so anything you add to execute(), you probably need to do there as well.
I think we either need to look at where enterState(QueryExecutionState::ValueType::EXECUTION) is called, or when _executionPhase = ExecutionPhase::EXECUTE is set. These should (I think) be mostly the same, looking from the outside.
|
@jbajic I think this should also get a simple regression test. |
Scope & Purpose
The
arangodb_aql_current_querymetrics could underflow when going below 0 and show the number of queries currently executing. This fixes the issueChecklist
Related Information
(Please reference tickets / specification / other PRs etc)