bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From evan...@apache.org
Subject [bigtop] branch branch-1.4 updated: BIGTOP-3204. Bump Flink to 1.6.4 (#522)
Date Mon, 22 Apr 2019 05:01:42 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/branch-1.4 by this push:
     new 8378d2d  BIGTOP-3204. Bump Flink to 1.6.4 (#522)
8378d2d is described below

commit 8378d2d89529060a96bf194cd18c3654b43ffe00
Author: Guodong Xu <guodong.xu@linaro.org>
AuthorDate: Mon Apr 22 12:51:27 2019 +0800

    BIGTOP-3204. Bump Flink to 1.6.4 (#522)
    
    Bump Flink version from 1.4.2 to 1.6.4. There are three changes involved:
    1. obviously, version number
    2. in Flink 1.6.4, there is no 'resources' folder any more. Removed it.
    3. set mode to 'legacy'
    
    Starting from Flink v1.5, there is a rewrite of Flink’s deployment and process
    model (internally known as FLIP-6). A new option 'mode' was introduced to
    indicate which executions to use. However, the way Bigtop puppet deploys
    'flink-jobmanager' and 'flink-taskmanager', ie. calling 'flink-daemon.sh
    jobmanager' and 'flink-daemon.sh taskmanager', is legacy. Without setting
    mode to 'legacy', flink's built-in exmaples fail with error
    "JobSubmissionException: Failed to submit JobGraph"
    
    Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
 bigtop-deploy/puppet/modules/flink/templates/flink-conf.yaml | 8 ++++++++
 bigtop-packages/src/common/flink/install_flink.sh            | 2 --
 bigtop.bom                                                   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bigtop-deploy/puppet/modules/flink/templates/flink-conf.yaml b/bigtop-deploy/puppet/modules/flink/templates/flink-conf.yaml
index 14e8853..cb9c1f4 100644
--- a/bigtop-deploy/puppet/modules/flink/templates/flink-conf.yaml
+++ b/bigtop-deploy/puppet/modules/flink/templates/flink-conf.yaml
@@ -26,6 +26,14 @@ jobmanager.web.port: <%= @ui_port %>
 taskmanager.tmp.dirs: <%= @storage_dirs.join(":") %>
 <% end %>
 
+# Starting from Flink v1.5, there is a rewrite of Flink’s deployment and process
+# model (internally known as FLIP-6). A new option 'mode' was introduced to
+# indicate which executions to use. However, the way Bigtop puppet deploys
+# 'flink-jobmanager' and 'flink-taskmanager', ie. calling 'flink-daemon.sh 
+# jobmanager' and 'flink-daemon.sh taskmanager', is legacy. Without setting
+# mode to 'legacy', flink's built-in exmaples fail with error
+# "JobSubmissionException: Failed to submit JobGraph"
+mode: legacy
 
 # For performance reasons its highly recommended to allocate as much memory to the
 # Flink TaskManager as possible by setting 'taskmanager.heap.mb'.
diff --git a/bigtop-packages/src/common/flink/install_flink.sh b/bigtop-packages/src/common/flink/install_flink.sh
index f63f546..6baa669 100644
--- a/bigtop-packages/src/common/flink/install_flink.sh
+++ b/bigtop-packages/src/common/flink/install_flink.sh
@@ -102,7 +102,6 @@ install -d -m 0755 $PREFIX/$LIB_DIR
 install -d -m 0755 $PREFIX/$LIB_DIR/bin
 install -d -m 0755 $PREFIX/$LIB_DIR/lib
 install -d -m 0755 $PREFIX/$LIB_DIR/examples
-install -d -m 0755 $PREFIX/$LIB_DIR/resources
 install -d -m 0755 $PREFIX/$CONF_DIR
 install -d -m 0755 $PREFIX/var/log/flink
 install -d -m 0755 $PREFIX/var/log/flink-cli
@@ -120,7 +119,6 @@ cp -a ${BUILD_DIR}/conf/* $PREFIX/$CONF_DIR
 ln -s /etc/flink/conf $PREFIX/$LIB_DIR/conf
 
 cp -ra ${BUILD_DIR}/examples/* $PREFIX/${LIB_DIR}/examples/
-cp -ra ${BUILD_DIR}/resources/* $PREFIX/${LIB_DIR}/resources/
 
 cp ${BUILD_DIR}/{LICENSE,NOTICE,README.txt} ${PREFIX}/${LIB_DIR}/
 
diff --git a/bigtop.bom b/bigtop.bom
index 0339284..26a3635 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -277,7 +277,7 @@ bigtop {
     'flink' {
       name    = 'flink'
       relNotes = 'Apache Flink'
-      version { base = '1.4.2'; pkg = base; release = 1 }
+      version { base = '1.6.4'; pkg = base; release = 1 }
       tarball { destination = "$name-${version.base}.tar.gz"
                 source      = "$name-${version.base}-src.tgz" }
       url     { download_path = "/$name/$name-${version.base}"


Mime
View raw message