IMPALA-762: Add the query status to Beeswax::get_log() and pick it up in the Impala shell.

COMPUTE STATS is an async DDL command. When COMPUTE STATS fails it will set the
query status of the QueryExecState properly, but the original Beeswax::query() RPC
won't throw. The Impala shell sometimes did not pick up and display the
query status because no RPC actually threw. To fix this, I modified
Beeswax::get_log() to include the query status if it is not ok. The shell looks
for a special prefix to distinguish the query status from the runtime state error log.

Change-Id: I0d9dbf0801629a37de22ea4ebb6d2e5d53b836ef
Reviewed-on: http://gerrit.ent.cloudera.com:8080/1899
Reviewed-by: Alex Behm <[email protected]>
Tested-by: jenkins

Author: Alex Behm

be/src/service/impala-beeswax-server.cc

@@ -187,6 +187,7 @@ void ImpalaServer::query(QueryHandle& query_handle, const Query& query) {
   // us to advance query state to FINISHED or EXCEPTION
   Thread wait_thread(
       "impala-server", "wait-thread", &ImpalaServer::Wait, this, exec_state);
+  RAISE_IF_ERROR(exec_state->query_status(), SQLSTATE_GENERAL_ERROR);
 }
 
 void ImpalaServer::executeAndWait(QueryHandle& query_handle, const Query& query,
@@ -379,8 +380,16 @@ void ImpalaServer::get_log(string& log, const LogContextId& context) {
     LOG(ERROR) << str.str();
     return;
   }
+  stringstream error_log_ss;
+  // If the query status is !ok, include the status error message at the top of the log.
+  if (!exec_state->query_status().ok()) {
+    error_log_ss << exec_state->query_status().GetErrorMsg();
+    log = error_log_ss.str();
+  }
   if (exec_state->coord() != NULL) {
-    log = exec_state->coord()->GetErrorLog();
+    if (!exec_state->query_status().ok()) error_log_ss << "\n\n";
+    error_log_ss << exec_state->coord()->GetErrorLog();
+    log = error_log_ss.str();
   }
 }
 

shell/impala_shell.py

@@ -621,7 +621,6 @@ def __execute_query(self, query, is_insert=False):
         self.__print_error_log()
         break
       elif query_state == self.query_state["EXCEPTION"]:
-        print_to_stderr('Query aborted.')
         if self.connected:
           self.__print_error_log()
           # Close the query handle even if it's an insert.
@@ -768,8 +767,10 @@ def __print_error_log(self):
     rpc_result = self.__do_rpc(
         lambda: self.imp_service.get_log(self.last_query_handle.log_context))
     log, status = rpc_result.get_results()
+    if status != RpcStatus.OK:
+      print_to_stderr("Failed to get error log: %s" % status)
     if log and log.strip():
-      print_to_stderr("\nERRORS ENCOUNTERED DURING EXECUTION: %s" % log)
+      print_to_stderr("ERRORS: %s" % log)
 
   def do_alter(self, args):
     return self.__execute_query(self.__create_beeswax_query("alter %s" % args))

tests/shell/test_shell_commandline.py

@@ -149,7 +149,7 @@ def test_completed_query_errors(self):
     args = ('-q "set abort_on_error=false;'
         ' select count(*) from functional_seq_snap.bad_seq_snap" --quiet')
     result = run_impala_shell_cmd(args)
-    assert 'ERRORS ENCOUNTERED DURING EXECUTION:' in result.stderr
+    assert 'ERRORS:' in result.stderr
     assert 'Bad synchronization marker' in result.stderr
     assert 'Expected: ' in result.stderr
     assert 'Actual: ' in result.stderr