You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/02/24 14:18:02 UTC
git commit: AMBARI-4749. Supervisor install failure on retry
installations (Arsen Babych via aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 2a0b71f0d -> ce202e3b1
AMBARI-4749. Supervisor install failure on retry installations
(Arsen Babych via aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce202e3b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce202e3b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce202e3b
Branch: refs/heads/trunk
Commit: ce202e3b185c8d5f4d821e06867970d763477cd8
Parents: 2a0b71f
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Mon Feb 24 05:14:58 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Mon Feb 24 05:16:48 2014 -0800
----------------------------------------------------------------------
.../HDP/2.1.1/services/STORM/package/scripts/storm.py | 2 +-
.../python/stacks/2.1.1/STORM/test_storm_drpc_server.py | 10 ++++++++++
.../stacks/2.1.1/STORM/test_storm_logviewer_server.py | 10 ++++++++++
.../test/python/stacks/2.1.1/STORM/test_storm_nimbus.py | 10 ++++++++++
.../stacks/2.1.1/STORM/test_storm_rest_api_service.py | 10 ++++++++++
.../python/stacks/2.1.1/STORM/test_storm_supervisor.py | 10 ++++++++++
.../python/stacks/2.1.1/STORM/test_storm_ui_server.py | 10 ++++++++++
7 files changed, 61 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce202e3b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/storm.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/storm.py b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/storm.py
index e790904..5e21325 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/storm.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/package/scripts/storm.py
@@ -25,7 +25,7 @@ import sys
def storm():
import params
- Directory([params.log_dir, params.pid_dir, params.local_dir],
+ Directory([params.log_dir, params.pid_dir, params.local_dir, params.conf_dir],
owner=params.storm_user,
group=params.user_group,
recursive=True
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce202e3b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py
index b66e859..ce9fe47 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_drpc_server.py
@@ -140,6 +140,11 @@ class TestStormDrpcServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
@@ -168,6 +173,11 @@ class TestStormDrpcServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce202e3b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py
index 3c42ada..83486b1 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_logviewer_server.py
@@ -140,6 +140,11 @@ class TestStormLogviewerServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
@@ -168,6 +173,11 @@ class TestStormLogviewerServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce202e3b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py
index 75c0377..94f44f9 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_nimbus.py
@@ -140,6 +140,11 @@ class TestStormNimbus(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
@@ -168,6 +173,11 @@ class TestStormNimbus(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce202e3b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
index b7ec67c..3ef78b5 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_rest_api_service.py
@@ -141,6 +141,11 @@ class TestStormRestApi(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
@@ -169,6 +174,11 @@ class TestStormRestApi(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce202e3b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py
index ca452cd..70ac98a 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_supervisor.py
@@ -141,6 +141,11 @@ class TestStormSupervisor(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
@@ -169,6 +174,11 @@ class TestStormSupervisor(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce202e3b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py
index 2e8d775..fa613aa 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/STORM/test_storm_ui_server.py
@@ -141,6 +141,11 @@ class TestStormUiServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),
@@ -169,6 +174,11 @@ class TestStormUiServer(RMFTestCase):
group = 'hadoop',
recursive = True,
)
+ self.assertResourceCalled('Directory', '/etc/storm/conf',
+ owner = 'storm',
+ group = 'hadoop',
+ recursive = True,
+ )
self.assertResourceCalled('File', '/etc/storm/conf/config.yaml',
owner = 'storm',
content = Template('config.yaml.j2'),