Impala Public Jenkins has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/21110 )
Change subject: IMPALA-12878: Report invalid query if finalized ...................................................................... IMPALA-12878: Report invalid query if finalized Fixes a case introduced by IMPALA-12493 where a query is closed again in the middle of unregistering - which appears to be possible with cancel_query_and_validate_state - returns "Query not yet running" instead of "Invalid or unknown query handle". IMPALA-12493 moved checks for whether a query is inflight before an atomic CompareAndSwap to mark a QueryDriver as finalized. As part of that change, a query that was Finalized and removed from inflight_queries - but not yet removed from query_driver_map_ - could report "Query not yet running". Updates the check for that error to also verify the query has not been finalized; if it has, we let the next conditional handle that case and return "Invalid or unknown query handle". Also ensures cancelled queries are closed in test_web_pages tests so assertions that num_in_flight_queries == 0 at the start of tests are valid when running the whole suite serially. This doesn't come up in automated tests because the cases that care about that assertion are marked execute_serially, while the cases that failed to close a query were not. Testing: adds a test to test_cancellation that ensures we get the expected "Invalid or unknown query handle" when close() is delayed in calling QueryDriver::Finalize. Change-Id: I3bf910f499147a09352f9dcb755037b0d8616dfd Reviewed-on: http://gerrit.cloudera.org:8080/21110 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- M be/src/runtime/query-driver.cc M be/src/service/impala-server.cc M tests/query_test/test_cancellation.py M tests/webserver/test_web_pages.py 4 files changed, 37 insertions(+), 1 deletion(-) Approvals: Impala Public Jenkins: Looks good to me, approved; Verified -- To view, visit http://gerrit.cloudera.org:8080/21110 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-Project: Impala-ASF Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3bf910f499147a09352f9dcb755037b0d8616dfd Gerrit-Change-Number: 21110 Gerrit-PatchSet: 8 Gerrit-Owner: Michael Smith <[email protected]> Gerrit-Reviewer: Impala Public Jenkins <[email protected]> Gerrit-Reviewer: Michael Smith <[email protected]> Gerrit-Reviewer: Riza Suminto <[email protected]>
