You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by mp...@apache.org on 2017/02/21 10:33:40 UTC
[1/2] kudu git commit: Change logging for OpenSSL init checking to
WARNING from DFATAL
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 <to...@apache.org>
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 <mj...@cloudera.com>
Authored: Mon Feb 20 15:54:57 2017 -0800
Committer: Todd Lipcon <to...@apache.org>
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();
[2/2] kudu git commit: [mini-cluster] fixed typos in
WaitForReplicaCount()
Posted by mp...@apache.org.
[mini-cluster] fixed typos in WaitForReplicaCount()
Fixed a couple of typos in ExternalMiniClusterFsInspector:
in implementation of WaitForReplicaCount() there was an extra call to
CountReplicasInMetadataDirs() and a typo in error message fmt string.
Change-Id: I4eef3e220fb3e330a8d7d29eb56adea1aab64ab0
Reviewed-on: http://gerrit.cloudera.org:8080/6090
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Tested-by: Kudu Jenkins
Reviewed-by: Mike Percy <mp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/2b0edbe3
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/2b0edbe3
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/2b0edbe3
Branch: refs/heads/master
Commit: 2b0edbe31ee6e75bc454d6398ac2974fc275b1d5
Parents: 0767cd7
Author: Alexey Serbin <as...@cloudera.com>
Authored: Mon Feb 20 22:51:30 2017 -0800
Committer: Mike Percy <mp...@apache.org>
Committed: Tue Feb 21 10:23:19 2017 +0000
----------------------------------------------------------------------
.../external_mini_cluster_fs_inspector.cc | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/2b0edbe3/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc b/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc
index 00441b1..3690f47 100644
--- a/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc
+++ b/src/kudu/integration-tests/external_mini_cluster_fs_inspector.cc
@@ -292,21 +292,21 @@ Status ExternalMiniClusterFsInspector::WaitForMinFilesInTabletWalDirOnTS(int ind
}
Status ExternalMiniClusterFsInspector::WaitForReplicaCount(int expected, const MonoDelta& timeout) {
- Status s;
- MonoTime deadline = MonoTime::Now() + timeout;
+ const MonoTime deadline = MonoTime::Now() + timeout;
int found;
while (true) {
found = CountReplicasInMetadataDirs();
- if (found == expected) return Status::OK();
- if (CountReplicasInMetadataDirs() == expected) return Status::OK();
+ if (found == expected) {
+ return Status::OK();
+ }
if (MonoTime::Now() > deadline) {
break;
}
SleepFor(MonoDelta::FromMilliseconds(10));
}
- return Status::TimedOut(Substitute("Timed out waiting for a total replica count of $0. "
- "Found $2 replicas",
- expected, found));
+ return Status::TimedOut(
+ Substitute("Timed out waiting for a total replica count of $0. "
+ "Found $1 replicas", expected, found));
}
Status ExternalMiniClusterFsInspector::WaitForTabletDataStateOnTS(