You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/12/08 01:48:50 UTC
ambari git commit: AMBARI-14257 : Storm metrics do not work after
upgrading Ambari to 2.1.2. (Aravindan Vijayan via swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 4d0260231 -> cbd2e8964
AMBARI-14257 : Storm metrics do not work after upgrading Ambari to 2.1.2. (Aravindan Vijayan via swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cbd2e896
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cbd2e896
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cbd2e896
Branch: refs/heads/branch-2.2
Commit: cbd2e896475c2d28bd7dd5613451eb8ff5f3354b
Parents: 4d02602
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Mon Dec 7 16:48:44 2015 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Mon Dec 7 16:48:44 2015 -0800
----------------------------------------------------------------------
.../src/main/python/resource_management/core/providers/system.py | 2 +-
.../common-services/STORM/0.9.1.2.1/package/scripts/storm.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbd2e896/ambari-common/src/main/python/resource_management/core/providers/system.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/providers/system.py b/ambari-common/src/main/python/resource_management/core/providers/system.py
index a3b01f0..4e6a122 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -204,7 +204,7 @@ class LinkProvider(Provider):
def action_delete(self):
path = self.resource.path
- if sudo.path_exists(path):
+ if sudo.path_lexists(path):
Logger.info("Deleting %s" % self.resource)
sudo.unlink(path)
http://git-wip-us.apache.org/repos/asf/ambari/blob/cbd2e896/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 51998fa..4e97c65 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
@@ -95,7 +95,7 @@ def storm(name=None):
)
# 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",
+ Link(format("{storm_lib_dir}/ambari-metrics-storm-sink.jar"),
action="delete")
Execute(format("{sudo} ln -s {metric_collector_sink_jar} {storm_lib_dir}/ambari-metrics-storm-sink.jar"),