mirror of
https://github.com/apache/impala.git
synced 2026-01-04 09:00:56 -05:00
6539e89c81
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
75 lines
2.4 KiB
Python
75 lines
2.4 KiB
Python
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import pytest
|
|
import tempfile
|
|
import socket
|
|
|
|
from tests.common.custom_cluster_test_suite import CustomClusterTestSuite
|
|
from tests.common.impala_service import ImpaladService
|
|
from tests.common.skip import SkipIfBuildType
|
|
from tests.shell.util import ImpalaShell, move_shell_history, restore_shell_history
|
|
|
|
class TestShellInteractiveReconnect(CustomClusterTestSuite):
|
|
""" Check if interactive shell is using the current DB after reconnecting """
|
|
@classmethod
|
|
def get_workload(cls):
|
|
return 'functional-query'
|
|
|
|
@classmethod
|
|
def setup_class(cls):
|
|
super(TestShellInteractiveReconnect, cls).setup_class()
|
|
|
|
cls.tempfile_name = tempfile.mktemp()
|
|
move_shell_history(cls.tempfile_name)
|
|
|
|
@classmethod
|
|
def teardown_class(cls):
|
|
restore_shell_history(cls.tempfile_name)
|
|
super(TestShellInteractiveReconnect, cls).teardown_class()
|
|
|
|
@pytest.mark.execute_serially
|
|
def test_manual_reconnect(self):
|
|
p = ImpalaShell()
|
|
p.send_cmd("USE functional")
|
|
p.send_cmd("CONNECT")
|
|
p.send_cmd("SHOW TABLES")
|
|
|
|
result = p.get_result()
|
|
assert "alltypesaggmultifilesnopart" in result.stdout
|
|
|
|
@pytest.mark.execute_serially
|
|
def test_auto_reconnect(self):
|
|
NUM_QUERIES = 'impala-server.num-queries'
|
|
|
|
impalad = ImpaladService(socket.getfqdn())
|
|
start_num_queries = impalad.get_metric_value(NUM_QUERIES)
|
|
|
|
p = ImpalaShell()
|
|
p.send_cmd("USE functional")
|
|
|
|
# wait for the USE command to finish
|
|
impalad.wait_for_metric_value(NUM_QUERIES, start_num_queries + 1)
|
|
impalad.wait_for_num_in_flight_queries(0)
|
|
|
|
self._start_impala_cluster([])
|
|
|
|
p.send_cmd("SHOW TABLES")
|
|
result = p.get_result()
|
|
assert "alltypesaggmultifilesnopart" in result.stdout
|
|
|