Repository: bigtop Updated Branches: refs/heads/master eb7506a52 -> b822a6c8e
BIGTOP-2907: upgrading Ambari from 2.5.0 to 2.5.2 Signed-off-by: Amir Sanjar <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b822a6c8 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b822a6c8 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b822a6c8 Branch: refs/heads/master Commit: b822a6c8ed77511d07bf512ba963b555e5fdff63 Parents: eb7506a Author: Amir Sanjar <[email protected]> Authored: Wed Oct 18 13:33:40 2017 -0500 Committer: Amir Sanjar <[email protected]> Committed: Wed Oct 18 16:09:25 2017 -0500 ---------------------------------------------------------------------- .../src/common/ambari/patch0-AMBARI.diff | 14 +------------- .../ambari/patch2-AMBARI-ConcurrentHashMap.diff | 19 ------------------- .../src/deb/ambari/ambari-agent.install | 2 +- .../src/deb/ambari/ambari-agent.prerm | 2 +- bigtop-packages/src/rpm/ambari/SPECS/ambari.spec | 4 ++-- bigtop.bom | 2 +- 6 files changed, 6 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/b822a6c8/bigtop-packages/src/common/ambari/patch0-AMBARI.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/patch0-AMBARI.diff b/bigtop-packages/src/common/ambari/patch0-AMBARI.diff index a77974c..842c560 100644 --- a/bigtop-packages/src/common/ambari/patch0-AMBARI.diff +++ b/bigtop-packages/src/common/ambari/patch0-AMBARI.diff @@ -10,16 +10,4 @@ index 7b97e65..49c37f3 100644 <tarLongFileMode>gnu</tarLongFileMode> <descriptors> <descriptor>src/main/assemblies/odpi-ambari-mpack.xml</descriptor> -diff --git a/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml b/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml -index 5dd3db4..f7bd433 100644 ---- a/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml -+++ b/contrib/management-packs/odpi-ambari-mpack/src/main/assemblies/odpi-ambari-mpack.xml -@@ -17,7 +17,7 @@ - limitations under the License. - --> - <assembly> -- <id></id> -+ <id>odpi-ambari-mpack</id> - <formats> - <format>dir</format> - <format>tar.gz</format> + http://git-wip-us.apache.org/repos/asf/bigtop/blob/b822a6c8/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff b/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff deleted file mode 100644 index bf0980e..0000000 --- a/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -ruaN apache-ambari-2.5.0-src.orig/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java apache-ambari-2.5.0-src/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java ---- apache-ambari-2.5.0-src.orig/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java 2017-03-27 20:46:35.000000000 -0400 -+++ apache-ambari-2.5.0-src/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java 2017-05-21 23:48:37.676372818 -0400 -@@ -25,6 +25,7 @@ - import java.util.Map; - import java.util.Map.Entry; - import java.util.Set; -+import java.util.concurrent.ConcurrentHashMap; - import java.util.concurrent.ConcurrentMap; - import java.util.concurrent.locks.Lock; - import java.util.concurrent.locks.ReadWriteLock; -@@ -77,7 +78,6 @@ - import org.apache.ambari.server.state.fsm.StateMachine; - import org.apache.ambari.server.state.fsm.StateMachineFactory; - import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper; --import org.jboss.netty.util.internal.ConcurrentHashMap; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; - http://git-wip-us.apache.org/repos/asf/bigtop/blob/b822a6c8/bigtop-packages/src/deb/ambari/ambari-agent.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ambari/ambari-agent.install b/bigtop-packages/src/deb/ambari/ambari-agent.install index 2cafa38..ff2d7cd 100644 --- a/bigtop-packages/src/deb/ambari/ambari-agent.install +++ b/bigtop-packages/src/deb/ambari/ambari-agent.install @@ -1,6 +1,6 @@ /etc/ambari-agent /etc/init.d/ambari-agent -/usr/sbin/ambari-agent +/var/lib/ambari-agent/bin/ambari-agent /usr/lib/ambari-agent /usr/lib/python2.6/site-packages/ambari_agent /var/run/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/b822a6c8/bigtop-packages/src/deb/ambari/ambari-agent.prerm ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/ambari/ambari-agent.prerm b/bigtop-packages/src/deb/ambari/ambari-agent.prerm index 70a9c63..92c6958 100755 --- a/bigtop-packages/src/deb/ambari/ambari-agent.prerm +++ b/bigtop-packages/src/deb/ambari/ambari-agent.prerm @@ -19,7 +19,7 @@ # for details if [ "$1" == "remove" ]; then # Action is uninstall - /usr/sbin/ambari-agent stop > /dev/null 2>&1 + /var/lib/ambari-agent/bin/ambari-agent stop > /dev/null 2>&1 if [ -d "/etc/ambari-agent/conf.save" ]; then mv /etc/ambari-agent/conf.save /etc/ambari-agent/conf_$(date '+%d_%m_%y_%H_%M').save fi http://git-wip-us.apache.org/repos/asf/bigtop/blob/b822a6c8/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec index 2433497..09af44b 100644 --- a/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec +++ b/bigtop-packages/src/rpm/ambari/SPECS/ambari.spec @@ -385,7 +385,7 @@ exit 0 if [ "$1" -eq 0 ]; then # Action is uninstall - /usr/sbin/ambari-agent stop > /dev/null 2>&1 + /var/lib/ambari-agent/bin/ambari-agent stop > /dev/null 2>&1 if [ -d "/etc/ambari-agent/conf.save" ]; then mv /etc/ambari-agent/conf.save /etc/ambari-agent/conf_$(date '+%d_%m_%y_%H_%M').save fi @@ -488,7 +488,7 @@ Ambari Client %attr(755,root,root) /usr/lib/ambari-agent/lib/examples %attr(755,root,root) /etc/ambari-agent/conf/ambari-agent.ini %attr(755,root,root) /etc/ambari-agent/conf/logging.conf.sample -%attr(755,root,root) /usr/sbin/ambari-agent +%attr(755,root,root) /var/lib/ambari-agent/bin/ambari-agent %config %attr(700,root,root) /var/lib/ambari-agent/ambari-env.sh %attr(700,root,root) /var/lib/ambari-agent/install-helper.sh %attr(700,root,root) /var/lib/ambari-agent/upgrade_agent_configs.py http://git-wip-us.apache.org/repos/asf/bigtop/blob/b822a6c8/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index bcc934e..70f800f 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -481,7 +481,7 @@ bigtop { 'ambari' { name = 'ambari' relNotes = 'Apache Ambari' - version { base = '2.5.0'; pkg = '2.5.0.0'; release = 1 } + version { base = '2.5.2'; pkg = '2.5.2.0'; release = 1 } tarball { destination = "apache-$name-${version.base}-src.tar.gz" source = destination } url { download_path = "/$name/$name-${version.base}/"
