You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ju...@apache.org on 2020/03/17 03:35:17 UTC
[bigtop] branch master updated: BIGTOP-3286: Bump Ignite to 2.7.6
This is an automated email from the ASF dual-hosted git repository.
junhe 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 cc2179b BIGTOP-3286: Bump Ignite to 2.7.6
cc2179b is described below
commit cc2179b0f1df2c4d7e8633f237f524234cd26602
Author: Yuqi Gu <yu...@arm.com>
AuthorDate: Mon Mar 9 03:14:12 2020 +0000
BIGTOP-3286: Bump Ignite to 2.7.6
Bump Ignite to 2.7.6 for release-1.5.0.
Change-Id: Ib03d2103d60fa0d03d549851420f442af8ddecbe
Signed-off-by: Yuqi Gu <yu...@arm.com>
---
.../puppet/modules/ignite_hadoop/templates/default-config.xml | 3 ++-
bigtop-packages/src/common/ignite-hadoop/do-component-build | 7 ++++++-
bigtop.bom | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/bigtop-deploy/puppet/modules/ignite_hadoop/templates/default-config.xml b/bigtop-deploy/puppet/modules/ignite_hadoop/templates/default-config.xml
index 9d8fc1e..c31cdcb 100644
--- a/bigtop-deploy/puppet/modules/ignite_hadoop/templates/default-config.xml
+++ b/bigtop-deploy/puppet/modules/ignite_hadoop/templates/default-config.xml
@@ -106,9 +106,10 @@
<bean class="org.apache.ignite.configuration.FileSystemConfiguration" parent="igfsCfgBase">
<property name="name" value="igfs"/>
- <!-- Caches with these names must be configured. -->
+ <!-- Remove the Ignite-2.7.6 deprecated property .
<property name="metaCacheName" value="igfs-meta"/>
<property name="dataCacheName" value="igfs-data"/>
+ -->
<!-- Configure TCP endpoint for communication with the file system instance. -->
<property name="ipcEndpointConfiguration">
diff --git a/bigtop-packages/src/common/ignite-hadoop/do-component-build b/bigtop-packages/src/common/ignite-hadoop/do-component-build
index 5525242..7127d5c 100644
--- a/bigtop-packages/src/common/ignite-hadoop/do-component-build
+++ b/bigtop-packages/src/common/ignite-hadoop/do-component-build
@@ -22,6 +22,10 @@ export MAVEN_OPTS="-Xmx512M"
sed -i '/asm-all/{n;s/4.2/5.0.2/}' modules/hadoop/pom.xml
+# Fix JVM_OPTS variable unbound issue when starting ignite-hadoop-service
+sed -i "s/JVM_OPTS/\{JVM_OPTS\:\-\}/g" bin/include/service.sh
+sed -i "s/^.*{JVM_OPTS:-}=.*$/JVM_OPTS=\"\$\{JVM_OPTS\:\-\} \-Xms1g \-Xmx1g \-server \-XX\:\+AggressiveOpts \-XX\:MaxPermSize\=512m\"/" bin/include/service.sh
+
cd ipc/shmem
# patch and build it
sed -i 's/\&ipcData->closed\,/(char *)\&ipcData->closed\,/' igniteshmem/org_apache_ignite_internal_util_ipc_shmem_IpcSharedMemoryUtils.cpp
@@ -36,4 +40,5 @@ mvn install:install-file -Dfile=ignite-shmem-1.0.0.jar -DgroupId=org.gridgain -D
rm -rf META-INF
cd -
-mvn clean install -DskipTests -Dhadoop.version=$HADOOP_VERSION -Dspark.version=$SPARK_VERSION -Dignite.edition=hadoop
+mvn clean install -Pall-java,all-scala -DskipTests -Dhadoop.version=$HADOOP_VERSION
+mvn initialize -Prelease -Dignite.edition=apache-ignite-hadoop
diff --git a/bigtop.bom b/bigtop.bom
index 025fdfe..0cb9d04 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -153,7 +153,7 @@ bigtop {
'ignite-hadoop' {
name = 'ignite-hadoop'
relNotes = 'Apache Ignite in-memory data fabric'
- version { base = '1.9.0'; pkg = base; release = 1 }
+ version { base = '2.7.6'; pkg = base; release = 1 }
tarball { destination = "${name}-${version.base}.tar.gz"
source = "apache-ignite-${version.base}-src.zip" }
url { download_path = "/ignite/${version.base}/"