You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by al...@apache.org on 2019/11/13 15:03:16 UTC
[kudu] branch master updated (98f44f4 -> f769f1d)
This is an automated email from the ASF dual-hosted git repository.
alexey pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git.
from 98f44f4 KUDU-2977 Sharding block map to speed up tserver startup
new 7e1bcb6 thirdparty: remove memkind from LICENSE.txt
new f769f1d mini_chronyd: switch to using symbolic links
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build-support/run_dist_test.py | 10 ++++++-
src/kudu/clock/CMakeLists.txt | 16 +++++------
thirdparty/LICENSE.txt | 60 ------------------------------------------
3 files changed, 17 insertions(+), 69 deletions(-)
[kudu] 02/02: mini_chronyd: switch to using symbolic links
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
commit f769f1db64076809486ec4bb6b4f39ff6c5bb1b7
Author: Adar Dembo <ad...@cloudera.com>
AuthorDate: Sun Nov 10 01:12:35 2019 -0800
mini_chronyd: switch to using symbolic links
The one gotcha is that the symbolic links won't exist a priori in a remote
dist-test machine, which causes MiniChronyd::GetPath to fail to find the
chrony binaries. To fix this, run_dist_test.py must recreate the links.
Change-Id: Id24d97d2badfee3e121f01a5280a2879513782de
Reviewed-on: http://gerrit.cloudera.org:8080/14684
Tested-by: Kudu Jenkins
Reviewed-by: Alexey Serbin <as...@cloudera.com>
---
build-support/run_dist_test.py | 10 +++++++++-
src/kudu/clock/CMakeLists.txt | 16 ++++++++--------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/build-support/run_dist_test.py b/build-support/run_dist_test.py
index a3a4138..7bd7620 100755
--- a/build-support/run_dist_test.py
+++ b/build-support/run_dist_test.py
@@ -153,9 +153,17 @@ def main():
env['SENTRY_HOME'] = glob.glob(os.path.join(ROOT, "thirdparty/src/sentry-*"))[0]
env['JAVA_HOME'] = glob.glob("/usr/lib/jvm/java-1.8.0-*")[0]
+ # Restore the symlinks to the chrony binaries; tests expect to find them in
+ # same directory as the test binaries themselves.
+ for bin_path in glob.glob(os.path.join(ROOT, "build/*/bin")):
+ os.symlink(os.path.join(ROOT, "thirdparty/installed/common/bin/chronyc"),
+ os.path.join(bin_path, "chronyc"))
+ os.symlink(os.path.join(ROOT, "thirdparty/installed/common/sbin/chronyd"),
+ os.path.join(bin_path, "chronyd"))
+
env['LD_LIBRARY_PATH'] = ":".join(
[os.path.join(ROOT, "build/dist-test-system-libs/")] +
- glob.glob(os.path.abspath((os.path.join(ROOT, "build/*/lib")))))
+ glob.glob(os.path.abspath(os.path.join(ROOT, "build/*/lib"))))
# Don't pollute /tmp in dist-test setting. If a test crashes, the dist-test slave
# will clear up our working directory but won't be able to find and clean up things
diff --git a/src/kudu/clock/CMakeLists.txt b/src/kudu/clock/CMakeLists.txt
index ddb09f4..b0e9d85 100644
--- a/src/kudu/clock/CMakeLists.txt
+++ b/src/kudu/clock/CMakeLists.txt
@@ -38,14 +38,14 @@ target_link_libraries(clock
##############################
if (NOT NO_CHRONY)
- # These are copied/installed instead of linking because:
- # * symlinks would not work with dist-test
- # * hardlinks would not work if the target directory is at different
- # filesystem than thirdparty
- file(COPY "${CMAKE_SOURCE_DIR}/thirdparty/installed/common/bin/chronyc"
- DESTINATION "${EXECUTABLE_OUTPUT_PATH}")
- file(COPY "${CMAKE_SOURCE_DIR}/thirdparty/installed/common/sbin/chronyd"
- DESTINATION "${EXECUTABLE_OUTPUT_PATH}")
+ # Link the chrony binaries so that they can be found via
+ # MiniChronyd::GetPath in MiniChronyd::Start.
+ execute_process(COMMAND ln -nsf
+ "${CMAKE_SOURCE_DIR}/thirdparty/installed/common/bin/chronyc"
+ "${EXECUTABLE_OUTPUT_PATH}/chronyc")
+ execute_process(COMMAND ln -nsf
+ "${CMAKE_SOURCE_DIR}/thirdparty/installed/common/sbin/chronyd"
+ "${EXECUTABLE_OUTPUT_PATH}/chronyd")
set(MINI_CHRONYD_SRCS test/mini_chronyd.cc)
[kudu] 01/02: thirdparty: remove memkind from LICENSE.txt
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 7e1bcb63958ad3e672322a005f441e5dd3a9d087
Author: Adar Dembo <ad...@cloudera.com>
AuthorDate: Tue Nov 12 23:26:18 2019 -0800
thirdparty: remove memkind from LICENSE.txt
I'm getting kinda overwhelmed by the sheer number of license files we seem
to be juggling. I guess that's how we missed this one.
Change-Id: I7989fca644f573e90304af4cbf5dc2440fe37d3e
Reviewed-on: http://gerrit.cloudera.org:8080/14703
Tested-by: Kudu Jenkins
Reviewed-by: Alexey Serbin <as...@cloudera.com>
---
thirdparty/LICENSE.txt | 60 --------------------------------------------------
1 file changed, 60 deletions(-)
diff --git a/thirdparty/LICENSE.txt b/thirdparty/LICENSE.txt
index 8e0a2ef..b9faf73 100644
--- a/thirdparty/LICENSE.txt
+++ b/thirdparty/LICENSE.txt
@@ -512,66 +512,6 @@ Source: http://savannah.nongnu.org/projects/libunwind/
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--------------------------------------------------------------------------------
-thirdparty/src/memkind-*/: BSD 3-clause license
-libraries: libmemkind
-Source: https://github.com/memkind/memkind
-
- Unless otherwise specified, files in the memkind source distribution are
- subject to the following license:
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Intel Corporation nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-memkind bundles jemalloc which is licensed under the BSD 2-clause license:
-
- Unless otherwise specified, files in the jemalloc source distribution are
- subject to the following license:
-
- Copyright (C) 2002-2017 Jason Evans <ja...@canonware.com>.
- All rights reserved.
- Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved.
- Copyright (C) 2009-2017 Facebook, Inc. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 1. Redistributions of source code must retain the above copyright notice(s),
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice(s),
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------
thirdparty/src/boost_*/: Boost Software License
Source: http://www.boost.org/