bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From evan...@apache.org
Subject [bigtop] branch master updated: BIGTOP-3132. Bump Alluxio up to 1.8.1 (#442)
Date Fri, 18 Jan 2019 09:56:33 GMT
This is an automated email from the ASF dual-hosted git repository.

evansye pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new a39fdb0  BIGTOP-3132. Bump Alluxio up to 1.8.1 (#442)
a39fdb0 is described below

commit a39fdb03173109504fd5167c79c5d63215143ca5
Author: Evans Ye <evansye@apache.org>
AuthorDate: Fri Jan 18 17:56:28 2019 +0800

    BIGTOP-3132. Bump Alluxio up to 1.8.1 (#442)
---
 .../src/common/alluxio/alluxio-master.svc          |  2 +-
 .../src/common/alluxio/alluxio-worker.svc          |  2 +-
 .../src/common/alluxio/install_alluxio.sh          | 62 +++++++++++----------
 .../common/alluxio/patch0-fix-license-check.diff   | 24 ++------
 bigtop-packages/src/deb/alluxio/alluxio.dirs       |  2 +-
 bigtop-packages/src/deb/alluxio/alluxio.install    |  2 +-
 bigtop-packages/src/deb/alluxio/alluxio.postinst   |  5 ++
 bigtop-packages/src/deb/alluxio/alluxio.preinst    | 64 ++++++++++++++++++++++
 bigtop-packages/src/deb/alluxio/alluxio.prerm      |  3 +
 bigtop-packages/src/deb/alluxio/control            |  2 +-
 bigtop-packages/src/deb/alluxio/rules              |  2 +-
 bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec | 13 ++---
 bigtop.bom                                         |  2 +-
 13 files changed, 124 insertions(+), 61 deletions(-)

diff --git a/bigtop-packages/src/common/alluxio/alluxio-master.svc b/bigtop-packages/src/common/alluxio/alluxio-master.svc
index 091cc2e..f9099c0 100644
--- a/bigtop-packages/src/common/alluxio/alluxio-master.svc
+++ b/bigtop-packages/src/common/alluxio/alluxio-master.svc
@@ -43,7 +43,7 @@ start() {
         ${EXEC_PATH} ${DAEMON_FLAGS} \
         > $LOG_FILE 2>&1 & "
 
-    sleep 3
+    sleep $SLEEP_TIME
 
     echo `ps -A -o pid,command | grep -i "[j]ava" | grep $KEYWORD | awk '{print $1}'` >
$PIDFILE
 
diff --git a/bigtop-packages/src/common/alluxio/alluxio-worker.svc b/bigtop-packages/src/common/alluxio/alluxio-worker.svc
index ca6dc8d..18e1774 100644
--- a/bigtop-packages/src/common/alluxio/alluxio-worker.svc
+++ b/bigtop-packages/src/common/alluxio/alluxio-worker.svc
@@ -47,7 +47,7 @@ start() {
         ${EXEC_PATH} ${DAEMON_FLAGS} \
         > $LOG_FILE 2>&1 & "
 
-    sleep 3
+    sleep $SLEEP_TIME
 
     echo `ps -A -o pid,command | grep -i "[j]ava" | grep $KEYWORD | awk '{print $1}'` >
$PIDFILE
 
diff --git a/bigtop-packages/src/common/alluxio/install_alluxio.sh b/bigtop-packages/src/common/alluxio/install_alluxio.sh
index 1ef7b1d..23f3f0a 100644
--- a/bigtop-packages/src/common/alluxio/install_alluxio.sh
+++ b/bigtop-packages/src/common/alluxio/install_alluxio.sh
@@ -92,12 +92,18 @@ done
 LIB_DIR=${LIB_DIR:-/usr/lib/alluxio}
 LIBEXEC_DIR=${INSTALLED_LIB_DIR:-/usr/libexec}
 BIN_DIR=${BIN_DIR:-/usr/bin}
+CONF_DIST_DIR=/etc/alluxio/conf.dist/
 
 install -d -m 0755 $PREFIX/$LIB_DIR
+install -d -m 0755 $PREFIX/$LIB_DIR/assembly/client/target
+install -d -m 0755 $PREFIX/$LIB_DIR/assembly/server/target
 install -d -m 0755 $PREFIX/$LIB_DIR/bin
 install -d -m 0755 $PREFIX/$LIB_DIR/libexec
 install -d -m 0755 $PREFIX/$LIB_DIR/lib
+install -d -m 0755 $PREFIX/$LIB_DIR/client
+install -d -m 0755 $PREFIX/$LIB_DIR/integration
 install -d -m 0755 $PREFIX/$LIB_DIR/share
+install -d -m 0755 $PREFIX/$LIB_DIR/core/server/common/src/main/webapp
 install -d -m 0755 $PREFIX/$DATA_DIR
 install -d -m 0755 $PREFIX/$DATA_DIR/alluxio
 install -d -m 0755 $PREFIX/etc
@@ -105,18 +111,36 @@ install -d -m 0755 $PREFIX/etc/alluxio
 install -d -m 0755 $PREFIX/etc/alluxio/conf
 install -d -m 0755 $PREFIX/$VAR_DIR/log/alluxio
 install -d -m 0755 $PREFIX/$VAR_DIR/lib/alluxio/journal
-install -d -m 0755 $PREFIX/$VAR_DIR/lib/alluxio/core/server/src/main/webapp
-ln -s $VAR_DIR/log/alluxio $PREFIX/$VAR_DIR/lib/alluxio/logs
 install -d -m 0755 $PREFIX/$VAR_DIR/run/alluxio
-
-cp assembly/target/alluxio*dependencies.jar core/client/target/alluxio*dependencies.jar $PREFIX/$LIB_DIR
-cp -a bin/* $PREFIX/${LIB_DIR}/bin
-cp -a libexec/* $PREFIX/${LIB_DIR}/libexec
-cp -rf core/server/src/main/webapp $PREFIX/$VAR_DIR/lib/alluxio/core/server/src/main
+install -d -m 0755 $PREFIX/$CONF_DIST_DIR
+
+ln -s $CONF_DIST_DIR $PREFIX/$LIB_DIR/conf
+ln -s $VAR_DIR/log/alluxio $PREFIX/$LIB_DIR/logs
+
+cp assembly/server/target/alluxio*dependencies.jar $PREFIX/$LIB_DIR/assembly/server/target
+cp assembly/client/target/alluxio*dependencies.jar $PREFIX/$LIB_DIR/assembly/client/target
+cp -a bin/* $PREFIX/$LIB_DIR/bin
+cp -a lib/* $PREFIX/$LIB_DIR/lib
+cp -a libexec/* $PREFIX/$LIB_DIR/libexec
+cp -a client/* $PREFIX/$LIB_DIR/client
+cp -a integration/* $PREFIX/$LIB_DIR/integration
+cp integration/checker/target/alluxio-checker-*-jar-with-dependencies.jar $PREFIX/$LIB_DIR/integration/checker
+cp integration/fuse/target/alluxio-integration-fuse-*-jar-with-dependencies.jar $PREFIX/$LIB_DIR/integration/fuse
+cp integration/yarn/target/alluxio-integration-yarn-*-jar-with-dependencies.jar $PREFIX/$LIB_DIR/integration/yarn
+rm -rf $PREFIX/$LIB_DIR/integration/pom.xml $PREFIX/$LIB_DIR/integration/**/pom.xml
+rm -rf $PREFIX/$LIB_DIR/integration/target $PREFIX/$LIB_DIR/integration/**/target
+rm -rf $PREFIX/$LIB_DIR/integration/**/src
+rm -rf $PREFIX/$LIB_DIR/integration/**/README.md
+cp -rf core/server/common/src/main/webapp $PREFIX/$LIB_DIR/core/server/common/src/main
 
 # Copy in the configuration files
-install -m 0644 conf/log4j.properties $PREFIX/etc/alluxio/conf
-cp conf/alluxio-env.sh.template $PREFIX/etc/alluxio/conf/alluxio-env.sh
+install -m 0644 conf/log4j.properties $PREFIX/$CONF_DIST_DIR
+cp conf/alluxio-env.sh.template $PREFIX/$CONF_DIST_DIR/alluxio-env.sh
+cp conf/alluxio-site.properties.template $PREFIX/$CONF_DIST_DIR/alluxio-site.properties
+cp conf/core-site.xml.template $PREFIX/$CONF_DIST_DIR/core-site.xml
+cp conf/metrics.properties.template $PREFIX/$CONF_DIST_DIR/metrics.properties
+cp conf/masters $PREFIX/$CONF_DIST_DIR/masters
+cp conf/workers $PREFIX/$CONF_DIST_DIR/workers
 
 # Copy in the /usr/bin/alluxio wrapper
 install -d -m 0755 $PREFIX/$BIN_DIR
@@ -137,23 +161,3 @@ exec ${LIB_DIR}/bin/alluxio "\$@"
 EOF
 chmod 755 $PREFIX/$BIN_DIR/alluxio
 
-cat >$PREFIX/$LIB_DIR/libexec/alluxio-layout.sh <<EOF
-#!/usr/bin/env bash
-
-export ALLUXIO_SYSTEM_INSTALLATION="TRUE"
-export ALLUXIO_PREFIX="$LIB_DIR"
-export ALLUXIO_HOME="/var/lib/alluxio"
-export ALLUXIO_CONF_DIR="/etc/alluxio/conf"
-export ALLUXIO_LOGS_DIR="/var/log/alluxio"
-export ALLUXIO_DATA_DIR="/var/run/alluxio"
-export ALLUXIO_JARS="\`find $LIB_DIR/ -name alluxio*dependencies.jar|grep -v client\`"
-
-# find JAVA_HOME
-. /usr/lib/bigtop-utils/bigtop-detect-javahome
-
-if [ -z "JAVA_HOME" ]; then
-  export JAVA="/usr/bin/java"
-else
-  export JAVA="\$JAVA_HOME/bin/java"
-fi
-EOF
diff --git a/bigtop-packages/src/common/alluxio/patch0-fix-license-check.diff b/bigtop-packages/src/common/alluxio/patch0-fix-license-check.diff
index f732488..75da34b 100644
--- a/bigtop-packages/src/common/alluxio/patch0-fix-license-check.diff
+++ b/bigtop-packages/src/common/alluxio/patch0-fix-license-check.diff
@@ -1,24 +1,12 @@
-From 5f0542f2f39b86cfc534a5f37953d1aa27cddaef Mon Sep 17 00:00:00 2001
-From: Jonathan Kelly <jonathak@amazon.com>
-Date: Mon, 2 May 2016 15:54:58 -0700
-Subject: [PATCH] tmp
-
----
- pom.xml | 1 +
- 1 file changed, 1 insertion(+)
-
 diff --git a/pom.xml b/pom.xml
-index 69921f9..89ca5a7 100644
+index a959527aa2..1051f153e2 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -500,6 +500,7 @@
- 
+@@ -1175,6 +1175,7 @@
+
              <!-- Build and Packaging Exclusions -->
              <exclude>build/**/*</exclude>
 +            <exclude>debian/**/*</exclude>
-             <exclude>**/pom.xml</exclude>
-             <exclude>**/logs/*</exclude>
-             <exclude>**/deploy/**/*</exclude>
--- 
-2.6.4 (Apple Git-63)
-
+             <exclude>conf/alluxio-env.sh</exclude>
+             <exclude>conf/alluxio-site.properties</exclude>
+             <exclude>conf/masters</exclude>
diff --git a/bigtop-packages/src/deb/alluxio/alluxio.dirs b/bigtop-packages/src/deb/alluxio/alluxio.dirs
index 0406eea..1481ebe 100644
--- a/bigtop-packages/src/deb/alluxio/alluxio.dirs
+++ b/bigtop-packages/src/deb/alluxio/alluxio.dirs
@@ -1,4 +1,4 @@
-/etc/alluxio/conf
+/etc/alluxio/conf.dist
 /usr/lib/alluxio
 /usr/bin
 /var/run/alluxio
diff --git a/bigtop-packages/src/deb/alluxio/alluxio.install b/bigtop-packages/src/deb/alluxio/alluxio.install
index 4fd8920..a8de643 100644
--- a/bigtop-packages/src/deb/alluxio/alluxio.install
+++ b/bigtop-packages/src/deb/alluxio/alluxio.install
@@ -1,3 +1,3 @@
-/etc/alluxio/conf
+/etc/alluxio/conf.dist
 /usr/lib/alluxio
 /usr/bin/alluxio
diff --git a/bigtop-packages/src/deb/alluxio/alluxio.postinst b/bigtop-packages/src/deb/alluxio/alluxio.postinst
index a2078db..8fd49a0 100644
--- a/bigtop-packages/src/deb/alluxio/alluxio.postinst
+++ b/bigtop-packages/src/deb/alluxio/alluxio.postinst
@@ -14,10 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+alluxio_pkg_name=alluxio
+
 set -e
 
 case "$1" in
     configure)
+        # Install config alternatives
+        chown -R alluxio:alluxio /var/log/alluxio
+        update-alternatives  --install /etc/${alluxio_pkg_name}/conf ${alluxio_pkg_name}-conf
/etc/${alluxio_pkg_name}/conf.dist 30
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/bigtop-packages/src/deb/alluxio/alluxio.preinst b/bigtop-packages/src/deb/alluxio/alluxio.preinst
new file mode 100644
index 0000000..5a1f632
--- /dev/null
+++ b/bigtop-packages/src/deb/alluxio/alluxio.preinst
@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+# 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.
+
+# preinst script for alluxio
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        getent group alluxio >/dev/null || groupadd -r alluxio
+        if ! getent passwd alluxio >/dev/null; then
+                # Adding system user: alluxio .
+                adduser \
+                  --system \
+                  --ingroup alluxio \
+                  --home /var/lib/alluxio \
+                  --gecos "alluxio User" \
+                  --shell /bin/false \
+                  alluxio >/dev/null
+        fi
+        install -d -m 0755 -o alluxio -g alluxio /var/log/alluxio
+        install -d -m 0755 -o alluxio -g alluxio /var/lib/alluxio
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/bigtop-packages/src/deb/alluxio/alluxio.prerm b/bigtop-packages/src/deb/alluxio/alluxio.prerm
index 4ba1a94..7ff21de 100644
--- a/bigtop-packages/src/deb/alluxio/alluxio.prerm
+++ b/bigtop-packages/src/deb/alluxio/alluxio.prerm
@@ -14,10 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+alluxio_pkg_name=alluxio
+
 set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
+      update-alternatives --remove ${alluxio_pkg_name}-conf /etc/${alluxio_pkg_name}/conf.dist
|| :
     ;;
 
     failed-upgrade)
diff --git a/bigtop-packages/src/deb/alluxio/control b/bigtop-packages/src/deb/alluxio/control
index 9b057c7..e23160e 100644
--- a/bigtop-packages/src/deb/alluxio/control
+++ b/bigtop-packages/src/deb/alluxio/control
@@ -16,7 +16,7 @@
 Source: alluxio
 Section: misc
 Priority: extra
-Maintainer: Huamin Chen <hchen@redhat.com>
+Maintainer: Bigtop <dev@bigtop.apache.org>
 Build-Depends: debhelper (>= 7.0.50~)
 Standards-Version: 3.9.4
 Homepage: http://www.alluxio.org
diff --git a/bigtop-packages/src/deb/alluxio/rules b/bigtop-packages/src/deb/alluxio/rules
index f595e10..bac4f9f 100755
--- a/bigtop-packages/src/deb/alluxio/rules
+++ b/bigtop-packages/src/deb/alluxio/rules
@@ -36,7 +36,7 @@ override_dh_auto_install:
     --bin-dir=/usr/bin \
     --data-dir=/usr/share \
     --libexec-dir=/usr/lib/alluxio/libexec \
-    --var-dir= /var/ \
+    --var-dir=/var \
     --prefix=debian/tmp
 	mkdir -p debian/alluxio/etc/init.d/
 	bash debian/init.d.tmpl debian/alluxio-master.svc deb debian/alluxio/etc/init.d/alluxio-master
diff --git a/bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec b/bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec
index 6fb4b69..6b5fd4c 100644
--- a/bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec
+++ b/bigtop-packages/src/rpm/alluxio/SPECS/alluxio.spec
@@ -125,20 +125,19 @@ done
 %defattr(-,root,root,-)
 %doc LICENSE README.md
 %dir %{_sysconfdir}/%{alluxio_name}
-%config(noreplace) %{_sysconfdir}/%{alluxio_name}/conf/log4j.properties
+%config(noreplace) %{_sysconfdir}/%{alluxio_name}/conf.dist
+%config(noreplace) %{_sysconfdir}/%{alluxio_name}/conf.dist/log4j.properties
+%config(noreplace) %{_sysconfdir}/%{alluxio_name}/conf.dist/alluxio-env.sh
+%config(noreplace) %{_sysconfdir}/%{alluxio_name}/conf.dist/alluxio-site.properties
+%config(noreplace) %{_sysconfdir}/%{alluxio_name}/conf.dist/core-site.xml
 %config(noreplace) %{initd_dir}/%{alluxio_name}-master
 %config(noreplace) %{initd_dir}/%{alluxio_name}-worker
-%config(noreplace) %{_sysconfdir}/%{alluxio_name}/conf/alluxio-env.sh
-%config(noreplace) %{alluxio_home}/libexec/alluxio-layout.sh
 %attr(0755,alluxio,alluxio) %{var_lib}
 %attr(0755,alluxio,alluxio) %{var_run}
 %attr(0755,alluxio,alluxio) %{var_log}
-%{alluxio_home}/alluxio*
-%{alluxio_home}/bin/alluxio*
-%{alluxio_home}/libexec/alluxio*
+%{alluxio_home}
 %{_datadir}/%{alluxio_name}
 /usr/bin/alluxio
-%{alluxio_home}/share
 
 
 %clean
diff --git a/bigtop.bom b/bigtop.bom
index 3664f7f..2fa624b 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -363,7 +363,7 @@ bigtop {
       name    = "alluxio"
       pkg     = "alluxio"
       relNotes = "Alluxio: a memory-centric distributed file system"
-      version { base = '1.0.1'; pkg = base; release = 1 }
+      version { base = '1.8.1'; pkg = base; release = 1 }
       tarball { destination = "$name-${version.base}.tar.gz"
                 source      = "v${version.base}.tar.gz" }
       url     { site = "https://github.com/Alluxio/alluxio/archive"


Mime
View raw message