This is an automated email from the ASF dual-hosted git repository. tarmstrong pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit 0a37377aa331d6c967be00efaf5028138de5d65d Author: Andrew Sherman <[email protected]> AuthorDate: Thu May 23 09:58:00 2019 -0700 IMPALA-8333: Remove Impala Shell warnings part 2 Set IMPALA_TOOLCHAIN_BUILD_ID=40-193a30b3af to pickup "Patch Thrift to 0.9.3-p6 to eliminate ssl warnings" Set IMPALA_THRIFT_VERSION=0.9.3-p6 to pick up the new thrift build, which removes an unnecessary and confusing warning. TESTING Change the tests in test_client_ssl.py which were looking for specific deprecation warnings to instead search for any Deprecation Warning. Ran all end-to-end tests with new toolchain. Built Impala on all supported platforms. Change-Id: I8ae7e068894da5981fc083e690051da268bfde4d Reviewed-on: http://gerrit.cloudera.org:8080/13404 Reviewed-by: Impala Public Jenkins <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- bin/impala-config.sh | 4 ++-- tests/custom_cluster/test_client_ssl.py | 13 ++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/bin/impala-config.sh b/bin/impala-config.sh index fca708d..5e60f45 100755 --- a/bin/impala-config.sh +++ b/bin/impala-config.sh @@ -68,7 +68,7 @@ fi # moving to a different build of the toolchain, e.g. when a version is bumped or a # compile option is changed. The build id can be found in the output of the toolchain # build jobs, it is constructed from the build number and toolchain git hash prefix. -export IMPALA_TOOLCHAIN_BUILD_ID=35-4c4c185a57 +export IMPALA_TOOLCHAIN_BUILD_ID=40-193a30b3af # Versions of toolchain dependencies. # ----------------------------------- export IMPALA_AVRO_VERSION=1.7.4-p4 @@ -141,7 +141,7 @@ export IMPALA_TPC_DS_VERSION=2.1.0 unset IMPALA_TPC_DS_URL export IMPALA_TPC_H_VERSION=2.17.0 unset IMPALA_TPC_H_URL -export IMPALA_THRIFT_VERSION=0.9.3-p5 +export IMPALA_THRIFT_VERSION=0.9.3-p6 unset IMPALA_THRIFT_URL export IMPALA_THRIFT11_VERSION=0.11.0-p2 unset IMPALA_THRIFT11_URL diff --git a/tests/custom_cluster/test_client_ssl.py b/tests/custom_cluster/test_client_ssl.py index 848ad8b..6f8f91f 100644 --- a/tests/custom_cluster/test_client_ssl.py +++ b/tests/custom_cluster/test_client_ssl.py @@ -54,10 +54,8 @@ class TestClientSsl(CustomClusterTestSuite): SAN_UNSUPPORTED_ERROR = ("Certificate error with remote host: hostname " "'localhost' doesn't match u'badCN'") - # Deprecation warnings that should not be seen. - DEPRECATED_POSITIONAL_WARNING = "positional argument is deprecated" - DEPRECATED_VALIDATE_WARNING = "validate is deprecated" - # TODO(IMPALA-8333) check for "DeprecationWarning" + # Deprecation warnings should not be seen. + DEPRECATION_WARNING = "DeprecationWarning" SSL_WILDCARD_ARGS = ("--ssl_client_ca_certificate=%s/wildcardCA.pem " "--ssl_server_certificate=%s/wildcard-cert.pem " @@ -231,17 +229,14 @@ class TestClientSsl(CustomClusterTestSuite): result = run_impala_shell_cmd(vector, shell_options, wait_until_connected=False) for msg in [self.SSL_ENABLED, self.CONNECTED, self.FETCHED]: assert msg in result.stderr - for warning in [self.DEPRECATED_POSITIONAL_WARNING, self.DEPRECATED_VALIDATE_WARNING]: - assert warning not in result.stderr + assert self.DEPRECATION_WARNING not in result.stderr if ca_cert != "": shell_options = shell_options + ["--ca_cert=%s" % ca_cert] result = run_impala_shell_cmd(vector, shell_options, wait_until_connected=False) for msg in [self.SSL_ENABLED, self.CONNECTED, self.FETCHED]: assert msg in result.stderr - for warning in [self.DEPRECATED_POSITIONAL_WARNING, - self.DEPRECATED_VALIDATE_WARNING]: - assert warning not in result.stderr + assert self.DEPRECATION_WARNING not in result.stderr def _verify_ssl_webserver(self): for port in ["25000", "25010", "25020"]:
