Repository: kudu Updated Branches: refs/heads/master f5274584a -> 2b0edbe31
Change logging for OpenSSL init checking to WARNING from DFATAL Crashing the client process is painful for some clients, e.g. Impala's python tests. Change-Id: I542a4550014916273ffb6d01f18b4123e7ad9144 Reviewed-on: http://gerrit.cloudera.org:8080/6084 Reviewed-by: Todd Lipcon <[email protected]> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/0767cd78 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/0767cd78 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/0767cd78 Branch: refs/heads/master Commit: 0767cd78007dc4073f32511a6a194f925d52f614 Parents: f527458 Author: Matthew Jacobs <[email protected]> Authored: Mon Feb 20 15:54:57 2017 -0800 Committer: Todd Lipcon <[email protected]> Committed: Tue Feb 21 02:10:17 2017 +0000 ---------------------------------------------------------------------- src/kudu/security/openssl_util.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/0767cd78/src/kudu/security/openssl_util.cc ---------------------------------------------------------------------- diff --git a/src/kudu/security/openssl_util.cc b/src/kudu/security/openssl_util.cc index cdff7e9..8c26db3 100644 --- a/src/kudu/security/openssl_util.cc +++ b/src/kudu/security/openssl_util.cc @@ -95,14 +95,13 @@ void DoInitializeOpenSSL() { // log a warning. auto ctx = ssl_make_unique(SSL_CTX_new(SSLv23_method())); if (ctx) { - LOG(DFATAL) << "It appears that OpenSSL has been previously initialized by " - << "code outside of Kudu. Please use kudu::client::DisableOpenSSLInitialization() " - << "to avoid potential crashes due to conflicting initialization."; - // Continue anyway rather than crashing the process in release builds. - // All of the below is idempotent, except for the locking callback, which we - // check before overriding. They aren't thread-safe, however -- that's why - // we try to get embedding applications to do the right thing here rather - // than risk a potential initialization race. + LOG(WARNING) << "It appears that OpenSSL has been previously initialized by " + << "code outside of Kudu. Please use kudu::client::DisableOpenSSLInitialization() " + << "to avoid potential crashes due to conflicting initialization."; + // Continue anyway; all of the below is idempotent, except for the locking callback, + // which we check before overriding. They aren't thread-safe, however -- that's why + // we try to get embedding applications to do the right thing here rather than risk a + // potential initialization race. } SSL_load_error_strings();
