You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2018/06/27 14:49:37 UTC
[10/50] [abbrv] ignite git commit: IGNITE-8807 Apache Ignite Linux
packages 2.6 update * added workaround for Windows 10 WSL prerm script *
added gracefull shutdown for stand-alone ignite nodes * removed verbosity
from chmod command for to avoid exces
IGNITE-8807 Apache Ignite Linux packages 2.6 update
* added workaround for Windows 10 WSL prerm script
* added gracefull shutdown for stand-alone ignite nodes
* removed verbosity from chmod command for to avoid excess information
output
* added unconditional postinstall chmod operations - Fixes #4195.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc2457f0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc2457f0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc2457f0
Branch: refs/heads/ignite-8446
Commit: cc2457f0f3451abdaa9c54e4dcc0cfa34b24da74
Parents: db7302b
Author: Ivanov Petr <pi...@gridgain.com>
Authored: Fri Jun 22 12:13:58 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Jun 22 12:13:58 2018 +0300
----------------------------------------------------------------------
packaging/deb/changelog | 6 ++++++
packaging/rpm/apache-ignite.spec | 31 +++++++++++++++++++++++++------
packaging/rpm/name.service | 2 +-
3 files changed, 32 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc2457f0/packaging/deb/changelog
----------------------------------------------------------------------
diff --git a/packaging/deb/changelog b/packaging/deb/changelog
index 99106f1..06ded60 100644
--- a/packaging/deb/changelog
+++ b/packaging/deb/changelog
@@ -1,3 +1,9 @@
+apache-ignite (2.6.0-1) unstable; urgency=low
+
+ * Updated Apache Ignite to version 2.6.0
+
+ -- Petr Ivanov <mr...@gmail.com> Fri, 15 Jun 2018 12:00:00 +0300
+
apache-ignite (2.5.0-1) unstable; urgency=low
* Updated Apache Ignite to version 2.5.0
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc2457f0/packaging/rpm/apache-ignite.spec
----------------------------------------------------------------------
diff --git a/packaging/rpm/apache-ignite.spec b/packaging/rpm/apache-ignite.spec
index 5929ea9..8a9ea89 100644
--- a/packaging/rpm/apache-ignite.spec
+++ b/packaging/rpm/apache-ignite.spec
@@ -11,7 +11,7 @@
#
Name: apache-ignite
-Version: 2.5.0
+Version: 2.6.0
Release: 1
Summary: Apache Ignite In-Memory Computing, Database and Caching Platform
Group: Development/System
@@ -64,6 +64,10 @@ echoUpgradeMessage () {
echo "======================================================================================================="
}
+setPermissions () {
+ chown -R %{user}:%{user} %{_sharedstatedir}/%{name} %{_log}/%{name}
+}
+
case $1 in
1|configure)
# DEB postinst upgrade
@@ -75,7 +79,7 @@ case $1 in
useradd -r -d %{_datadir}/%{name} -s /usr/sbin/nologin %{user}
# Change ownership for work and log directories
- chown -vR %{user}:%{user} %{_sharedstatedir}/%{name} %{_log}/%{name}
+ setPermissions
# Install alternatives
# Commented out until ignitevisorcmd / ignitesqlline is ready to work from any user
@@ -97,8 +101,10 @@ case $1 in
cp -rf $file %{_sharedstatedir}/%{name}/
fi
done
- chown -vR %{user}:%{user} %{_sharedstatedir}/%{name} %{_log}/%{name}
fi
+
+ # Change ownership for work and log directories (yum resets permissions on upgrade nevertheless)
+ setPermissions
;;
esac
@@ -112,10 +118,19 @@ esac
# 1 - Upgrade
#
+stopIgniteNodes () {
+ if ! $(grep -q "Microsoft" /proc/version); then
+ systemctl stop 'apache-ignite@*'
+ fi
+ ps ax | grep '\-DIGNITE_HOME' | head -n-1 | awk {'print $1'} | while read pid; do
+ kill -INT ${pid}
+ done
+}
+
case $1 in
0|remove)
- # Stop all nodes
- systemctl stop 'apache-ignite@*'
+ # Stop all nodes (both service and standalone)
+ stopIgniteNodes
# Remove alternatives
# Commented out until ignitevisorcmd / ignitesqlline is ready to work from any user
@@ -125,10 +140,11 @@ case $1 in
#update-alternatives --display ignitesqlline || true
;;
1|upgrade)
+ # Stop all nodes (both service and standalone)
echo "=================================================================================="
echo " WARNING: All running Apache Ignite's nodes will be stopped upon package update "
echo "=================================================================================="
- systemctl stop 'apache-ignite@*'
+ stopIgniteNodes
;;
esac
@@ -249,6 +265,9 @@ ln -sf %{_log}/%{name} %{buildroot}%{_sharedstatedir}/%{name}/log
# Changelog
#
+* Fri Jun 17 2018 Peter Ivanov <mr...@gmail.com> - 2.6.0-1
+- Updated Apache Ignite to version 2.6.0
+
* Tue Apr 17 2018 Peter Ivanov <mr...@gmail.com> - 2.5.0-1
- Updated Apache Ignite to version 2.5.0
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc2457f0/packaging/rpm/name.service
----------------------------------------------------------------------
diff --git a/packaging/rpm/name.service b/packaging/rpm/name.service
index 0929f2c..78b5d25 100644
--- a/packaging/rpm/name.service
+++ b/packaging/rpm/name.service
@@ -7,7 +7,7 @@ Type=forking
User=#user#
WorkingDirectory=/usr/share/#name#/work
PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/#name#
+ExecStartPre=-/usr/bin/mkdir -p /var/run/#name#
ExecStartPre=-/usr/bin/chown #user#:#user# /var/run/#name#
ExecStartPre=-/usr/bin/env bash /usr/share/#name#/bin/service.sh set-firewall
ExecStart=/usr/share/#name#/bin/service.sh start %i