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/04/19 01:02:26 UTC
[1/3] kudu git commit: Fix thirdparty build error in Centos 6.
Repository: kudu
Updated Branches:
refs/heads/master 1a5998e91 -> e56f81b5d
Fix thirdparty build error in Centos 6.
When doing a fresh build in Centos 6, one might get errors like
this: libcurl.so: undefined reference to `libssh2_userauth_list'.
This patch fixes this error by building curl without libssh2.
Change-Id: I3c72d76f6c4f5db7eb03f3e5f7efb4d3f6bb1e74
Reviewed-on: http://gerrit.cloudera.org:8080/6673
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/d5b98946
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/d5b98946
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/d5b98946
Branch: refs/heads/master
Commit: d5b98946a2c6d060a33054fff9314bac3f012c20
Parents: 1a5998e
Author: Amos Bird <am...@gmail.com>
Authored: Wed Apr 19 02:42:48 2017 +0800
Committer: Todd Lipcon <to...@apache.org>
Committed: Wed Apr 19 00:46:19 2017 +0000
----------------------------------------------------------------------
thirdparty/build-definitions.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/d5b98946/thirdparty/build-definitions.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
index ab5d0bd..bf70f6c 100644
--- a/thirdparty/build-definitions.sh
+++ b/thirdparty/build-definitions.sh
@@ -515,7 +515,8 @@ build_curl() {
--disable-smtp \
--disable-telnet \
--disable-tftp \
- --without-librtmp
+ --without-librtmp \
+ --without-libssh2
make -j$PARALLEL $EXTRA_MAKEFLAGS install
popd
}
[2/3] kudu git commit: Replace deprecated OpenSSL function
ERR_remove_state()
Posted by mp...@apache.org.
Replace deprecated OpenSSL function ERR_remove_state()
ERR_remove_state() has been deprecated. ERR_remove_thread_state()
should be used in its place instead.
Change-Id: If0d2895cd331f94ad383e8666b84e15bfc035d3a
Reviewed-on: http://gerrit.cloudera.org:8080/6556
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/6200da98
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/6200da98
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/6200da98
Branch: refs/heads/master
Commit: 6200da9807007a01d22812b47f937354811c370a
Parents: d5b9894
Author: Sailesh Mukil <sa...@apache.org>
Authored: Tue Apr 4 23:52:47 2017 -0700
Committer: Todd Lipcon <to...@apache.org>
Committed: Wed Apr 19 00:46:46 2017 +0000
----------------------------------------------------------------------
src/kudu/rpc/reactor.cc | 3 +++
src/kudu/security/tls_socket.cc | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/6200da98/src/kudu/rpc/reactor.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/reactor.cc b/src/kudu/rpc/reactor.cc
index 87056d1..1a74aaf 100644
--- a/src/kudu/rpc/reactor.cc
+++ b/src/kudu/rpc/reactor.cc
@@ -152,6 +152,9 @@ void ReactorThread::ShutdownInternal() {
task->Abort(aborted); // should also free the task.
}
scheduled_tasks_.clear();
+
+ // Remove the OpenSSL thread state.
+ ERR_remove_thread_state(nullptr);
}
ReactorTask::ReactorTask() {
http://git-wip-us.apache.org/repos/asf/kudu/blob/6200da98/src/kudu/security/tls_socket.cc
----------------------------------------------------------------------
diff --git a/src/kudu/security/tls_socket.cc b/src/kudu/security/tls_socket.cc
index 54c1f14..dbe5c68 100644
--- a/src/kudu/security/tls_socket.cc
+++ b/src/kudu/security/tls_socket.cc
@@ -147,7 +147,6 @@ Status TlsSocket::Close() {
}
ssl_.reset();
- ERR_remove_state(0);
// Close the underlying socket.
RETURN_NOT_OK(Socket::Close());
[3/3] kudu git commit: log-test: Add additional assert
Posted by mp...@apache.org.
log-test: Add additional assert
This just adds an additional check which is nice to have in this test.
This was added in a backport to the 1.2.x branch and so is also being
added here.
Change-Id: Idb4847cb3fa8d4600be8a9b1b681613046988018
Reviewed-on: http://gerrit.cloudera.org:8080/6674
Tested-by: Mike Percy <mp...@apache.org>
Reviewed-by: Alexey Serbin <as...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/e56f81b5
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/e56f81b5
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/e56f81b5
Branch: refs/heads/master
Commit: e56f81b5d4e97deff3d071e1e3bfa421485d73ff
Parents: 6200da9
Author: Mike Percy <mp...@apache.org>
Authored: Tue Apr 18 11:47:46 2017 -0700
Committer: Mike Percy <mp...@apache.org>
Committed: Wed Apr 19 01:01:43 2017 +0000
----------------------------------------------------------------------
src/kudu/consensus/log-test.cc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/e56f81b5/src/kudu/consensus/log-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/consensus/log-test.cc b/src/kudu/consensus/log-test.cc
index 9098479..f37f60e 100644
--- a/src/kudu/consensus/log-test.cc
+++ b/src/kudu/consensus/log-test.cc
@@ -1017,6 +1017,7 @@ TEST_P(LogTestOptionalCompression, TestReadReplicatesHighIndex) {
ASSERT_OK(reader->ReadReplicatesInRange(first_log_index, first_log_index + kSequenceLength - 1,
LogReader::kNoSizeLimit, &replicates));
ASSERT_EQ(kSequenceLength, replicates.size());
+ ASSERT_GT(op_id.index(), std::numeric_limits<int32_t>::max());
}
// Test various situations where we expect different segments depending on what the