You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/12/11 00:08:30 UTC
[2/2] ambari git commit: AMBARI-1432. RESTART STORM/NIMBUS fails
during EU, 2.1 --> 2.3 (dlysnichenko)
AMBARI-1432. RESTART STORM/NIMBUS fails during EU, 2.1 --> 2.3 (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7bb89007
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7bb89007
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7bb89007
Branch: refs/heads/trunk
Commit: 7bb890075e5c70a2ea24cddc753428fe51ac9810
Parents: 2b0cb80
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Dec 11 01:07:08 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Dec 11 01:07:53 2015 +0200
----------------------------------------------------------------------
.../common-services/STORM/0.9.1.2.1/package/scripts/storm.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7bb89007/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
index 4e97c65..7000861 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
@@ -94,9 +94,11 @@ def storm(name=None):
content=Template("storm-metrics2.properties.j2")
)
- # Remove symlink. It can be there, if you doing upgrade from HDP < 2.2 to HDP >= 2.2
+ # Remove symlinks. They can be there, if you doing upgrade from HDP < 2.2 to HDP >= 2.2
Link(format("{storm_lib_dir}/ambari-metrics-storm-sink.jar"),
action="delete")
+ # On old HDP 2.1 versions, this symlink may also exist and break EU to newer versions
+ Link("/usr/lib/storm/lib/ambari-metrics-storm-sink.jar", action="delete")
Execute(format("{sudo} ln -s {metric_collector_sink_jar} {storm_lib_dir}/ambari-metrics-storm-sink.jar"),
not_if=format("ls {storm_lib_dir}/ambari-metrics-storm-sink.jar"),