Repository: bigtop Updated Branches: refs/heads/master 23582dc06 -> d3c49e078
BIGTOP-3023: Bump qfs to 2.0.0 Prior to v2.0.0, qfs doesn't build with openssl-1.1. This makes bigtop failed on debian-9. Bump to v2.0.0 should solve this problem. Change-Id: I4665e6de206ee928d1d8fbf21694bb92ef11752c Signed-off-by: Jun He <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d3c49e07 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d3c49e07 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d3c49e07 Branch: refs/heads/master Commit: d3c49e07867f2912dec80291ff0a9475683292e9 Parents: 23582dc Author: Jun He <[email protected]> Authored: Tue Apr 24 14:11:34 2018 +0800 Committer: Olaf Flebbe <[email protected]> Committed: Sun Apr 29 18:44:26 2018 +0200 ---------------------------------------------------------------------- bigtop-packages/src/common/qfs/install_qfs.sh | 8 +++---- .../common/qfs/patch1-findsusekrb5config.diff | 11 --------- .../src/common/qfs/qfs-chunkserver.cfg | 24 ++++++++++++++++++++ .../src/common/qfs/qfs-metaserver.cfg | 24 ++++++++++++++++++++ bigtop-packages/src/common/qfs/qfs-webui.cfg | 24 ++++++++++++++++++++ bigtop-packages/src/deb/qfs/qfs-client.install | 2 -- bigtop-packages/src/deb/qfs/rules | 3 +++ bigtop-packages/src/rpm/qfs/SPECS/qfs.spec | 2 -- bigtop.bom | 2 +- 9 files changed, 79 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/d3c49e07/bigtop-packages/src/common/qfs/install_qfs.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/qfs/install_qfs.sh b/bigtop-packages/src/common/qfs/install_qfs.sh index b6cca00..1b4249b 100644 --- a/bigtop-packages/src/common/qfs/install_qfs.sh +++ b/bigtop-packages/src/common/qfs/install_qfs.sh @@ -179,8 +179,6 @@ install -m 755 build/release/bin/tools/qfsstats $BIN_DIR install -m 755 build/release/bin/tools/qfstoggleworm $BIN_DIR install -m 755 scripts/qfs_backup $BIN_DIR -install -m 755 scripts/qfs_checkpoint_prune.py $BIN_DIR/qfs_checkpoint_prune -install -m 755 scripts/qfs_log_prune.py $BIN_DIR/qfs_log_prune mkdir -p $LIB_DIR install -m 644 build/release/lib/libgf_complete.so $LIB_DIR @@ -212,9 +210,9 @@ install -m 644 build/release/lib/static/libqfs_qcrs.a $LIB_DIR install -m 644 build/release/lib/static/libqfs_tools.a $LIB_DIR mkdir -p $ETC_DIR/logrotate.d -install -m 644 contrib/logrotate/qfs-chunkserver $ETC_DIR/logrotate.d -install -m 644 contrib/logrotate/qfs-metaserver $ETC_DIR/logrotate.d -install -m 644 contrib/logrotate/qfs-webui $ETC_DIR/logrotate.d +cp $SOURCE_DIR/qfs-chunkserver.cfg $ETC_DIR/logrotate.d/qfs-chunkserver +cp $SOURCE_DIR/qfs-metaserver.cfg $ETC_DIR/logrotate.d/qfs-metaserver +cp $SOURCE_DIR/qfs-webui.cfg $ETC_DIR/logrotate.d/qfs-webui mkdir -p $INCLUDE_DIR cp -a build/release/include/* $INCLUDE_DIR http://git-wip-us.apache.org/repos/asf/bigtop/blob/d3c49e07/bigtop-packages/src/common/qfs/patch1-findsusekrb5config.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/qfs/patch1-findsusekrb5config.diff b/bigtop-packages/src/common/qfs/patch1-findsusekrb5config.diff deleted file mode 100644 index d1e12dc..0000000 --- a/bigtop-packages/src/common/qfs/patch1-findsusekrb5config.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- qfs-1.1.4/cmake/Modules/FindKrb5.cmake.old 2016-03-06 11:17:38.041431320 +0100 -+++ qfs-1.1.4/cmake/Modules/FindKrb5.cmake 2016-03-06 11:18:38.165433125 +0100 -@@ -25,7 +25,7 @@ - NO_DEFAULT_PATH - ) - ENDIF(KRB5_PREFIX) --FIND_PROGRAM(KRB5_C_CONFIG NAMES krb5-config) -+FIND_PROGRAM(KRB5_C_CONFIG NAMES krb5-config PATHS /usr/lib/mit/bin) - - MESSAGE(STATUS "found krb5-config here ${KRB5_C_CONFIG}") - http://git-wip-us.apache.org/repos/asf/bigtop/blob/d3c49e07/bigtop-packages/src/common/qfs/qfs-chunkserver.cfg ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/qfs/qfs-chunkserver.cfg b/bigtop-packages/src/common/qfs/qfs-chunkserver.cfg new file mode 100644 index 0000000..8ee0761 --- /dev/null +++ b/bigtop-packages/src/common/qfs/qfs-chunkserver.cfg @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +/var/log/qfs/chunkserver.log { + daily + dateext + rotate 25 + missingok + notifempty + compress + copytruncate +} + http://git-wip-us.apache.org/repos/asf/bigtop/blob/d3c49e07/bigtop-packages/src/common/qfs/qfs-metaserver.cfg ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/qfs/qfs-metaserver.cfg b/bigtop-packages/src/common/qfs/qfs-metaserver.cfg new file mode 100644 index 0000000..fe994c8 --- /dev/null +++ b/bigtop-packages/src/common/qfs/qfs-metaserver.cfg @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +/var/log/qfs/metaserver.log { + daily + dateext + rotate 25 + missingok + notifempty + compress + copytruncate +} + http://git-wip-us.apache.org/repos/asf/bigtop/blob/d3c49e07/bigtop-packages/src/common/qfs/qfs-webui.cfg ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/qfs/qfs-webui.cfg b/bigtop-packages/src/common/qfs/qfs-webui.cfg new file mode 100644 index 0000000..63638c7 --- /dev/null +++ b/bigtop-packages/src/common/qfs/qfs-webui.cfg @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +/var/log/qfs/webui.log { + daily + dateext + rotate 25 + missingok + notifempty + compress + copytruncate +} + http://git-wip-us.apache.org/repos/asf/bigtop/blob/d3c49e07/bigtop-packages/src/deb/qfs/qfs-client.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/qfs/qfs-client.install b/bigtop-packages/src/deb/qfs/qfs-client.install index 225dc0f..3e6f777 100644 --- a/bigtop-packages/src/deb/qfs/qfs-client.install +++ b/bigtop-packages/src/deb/qfs/qfs-client.install @@ -12,8 +12,6 @@ /usr/bin/qfstoggleworm /usr/bin/qfssample /usr/bin/qfs_backup -/usr/bin/qfs_checkpoint_prune -/usr/bin/qfs_log_prune /usr/bin/cpfromqfs /usr/bin/cptoqfs http://git-wip-us.apache.org/repos/asf/bigtop/blob/d3c49e07/bigtop-packages/src/deb/qfs/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/qfs/rules b/bigtop-packages/src/deb/qfs/rules index 59d78ea..c57c110 100755 --- a/bigtop-packages/src/deb/qfs/rules +++ b/bigtop-packages/src/deb/qfs/rules @@ -47,6 +47,9 @@ override_dh_auto_build: --qfs-version=$(QFS_BASE_VERSION) \ --python=$(PYTHON_PATH) +override_dh_auto_test: + @echo Tests are disabled + override_dh_auto_install: bash -x debian/install_qfs.sh \ --source-dir=debian \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/d3c49e07/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec b/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec index efce8cc..6723e4e 100644 --- a/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec +++ b/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec @@ -260,8 +260,6 @@ rm -rf $RPM_BUILD_ROOT %{bin_dir}/qfstoggleworm %{bin_dir}/qfssample %{bin_dir}/qfs_backup -%{bin_dir}/qfs_checkpoint_prune -%{bin_dir}/qfs_log_prune %{bin_dir}/cpfromqfs %{bin_dir}/cptoqfs http://git-wip-us.apache.org/repos/asf/bigtop/blob/d3c49e07/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index f8bc660..a6e2a79 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -463,7 +463,7 @@ bigtop { 'qfs' { name = 'qfs' relNotes = 'Quantcast Filesystem' - version { base = '1.1.4'; pkg = base; release = 1 } + version { base = '2.0.0'; pkg = base; release = 1 } tarball { destination = "$name-${version.base}.tar.gz" source = "${version.base}.tar.gz" } url { site = "https://github.com/quantcast/qfs/archive";
