jprdonnelly/impala
1
0
Fork 0
mirror of https://github.com/apache/impala.git synced 2025-12-23 21:08:39 -05:00
Code Issues Projects Releases Wiki Activity

IMPALA-2235: Fix current db when shell auto-reconnects

Browse Source 
The ImpalaShell didn't issue the 'USE <current-db>' command after
reconnecting to the Impala daemon. Therefore the client session
used the default DB after reconnection, not the previously selected DB.

Setting the current DB is done by the _validate_database method.
Before this commit it appended the "use <db>" command to the
command queue of the Cmd class. But, at this point we might already
have commands in the command queue that will run before the
"use <db>" command. In case of reconnection, we want to invoke
the USE command right away.

Also, the command processed by the precmd() method can entirely skip
the command queue, therefore it is not enough to insert the USE
command to the front of the command queue. We need to issue the
USE command with the onecmd() method to execute it immediately.

I extended the _validate_database method with an "immediately" flag.
If this flag is true, _validate_database will use the onecmd() method.
Otherwise, it will append the USE command to the command queue to
maintain the previous behaviour.

I added a new automated test suite named test_shell_interactive_reconnect.py
to the "custom cluster" tests. It sets the default database, and after
reconnection it checks if the shell set it again automatically.

One test case checks if the shell set the DB after manually reconnecting
to the impala daemon by issuing the CONNECT command.
The other test case checks if the shell set the DB after automatic
reconnection due to cluster restart.

I needed to backup the impala shell history file because I didn't
want to pollute it by the test cases (just like the way it is done in
tests/shell/test_shell_interactive.py). I created utility functions for
this in tests/shell/util.py and now test_shell_interactive.py and
the newly created test suite are using these utility functions.

Change-Id: I40dfa00ba0314d356fe8617446f516505c925e5e
Reviewed-on: http://gerrit.cloudera.org:8080/8368
Reviewed-by: Tim Armstrong <tarmstrong@cloudera.com>
Tested-by: Impala Public Jenkins
This commit is contained in:
Zoltan Borok-Nagy
2017-11-03 15:54:58 +01:00
committed by Impala Public Jenkins
parent 87fc463e0a
commit 6539e89c81
4 changed files with 106 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
shell/impala_shell.py
View File

@@ -487,6 +487,7 @@ class ImpalaShell(object, cmd.Cmd):
except TException:
print_to_stderr("Connection lost, reconnecting...")
self._connect()
self._validate_database(immediately=True)
return args.encode('utf-8')
def onecmd(self, line):
@@ -730,10 +731,21 @@ class ImpalaShell(object, cmd.Cmd):
self._connect()
self._validate_database()
def _validate_database(self):
def _validate_database(self, immediately=False):
""" Issues a "USE <db>" command where <db> is the current database.
It is typically needed after the connection is (re-)established to the Impala daemon.
If immediately is False, it appends the USE command to self.cmdqueue.
If immediately is True, it executes the USE command right away.
"""
if self.current_db:
self.current_db = self.current_db.strip('`')
self.cmdqueue.append(('use `%s`' % self.current_db) + ImpalaShell.CMD_DELIM)
use_current_db = ('use `%s`' % self.current_db)
if immediately:
self.onecmd(use_current_db)
else:
self.cmdqueue.append(use_current_db + ImpalaShell.CMD_DELIM)
def _print_if_verbose(self, message):
if self.verbose: