You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/09/03 17:37:24 UTC
ambari git commit: AMBARI-12999. Make link creation upgrade
compatible, because after upgrade, Storm start fails.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 61ee2abe7 -> f70ca4399
AMBARI-12999. Make link creation upgrade compatible, because after upgrade, Storm start fails.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f70ca439
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f70ca439
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f70ca439
Branch: refs/heads/branch-2.1
Commit: f70ca4399c34fec09d27c15174be351f6852363e
Parents: 61ee2ab
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Thu Sep 3 18:37:05 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Thu Sep 3 18:37:05 2015 +0300
----------------------------------------------------------------------
.../common-services/STORM/0.9.1.2.1/package/scripts/storm.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f70ca439/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 8d629ab..ac5c9f8 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
@@ -20,7 +20,7 @@ limitations under the License.
from resource_management.core.exceptions import Fail
from resource_management.core.resources.service import ServiceConfig
-from resource_management.core.resources.system import Directory, Execute, File
+from resource_management.core.resources.system import Directory, Execute, File, Link
from resource_management.core.source import InlineTemplate
from resource_management.libraries.resources.template_config import TemplateConfig
from resource_management.libraries.functions.format import format
@@ -93,6 +93,10 @@ 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
+ 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"),
only_if=format("ls {metric_collector_sink_jar}")