You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2016/07/20 17:05:49 UTC

[1/2] ambari git commit: AMBARI-17812 UT failure in trunk - test_start_default_embedded (dsen)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 3e636b5cf -> b940d7a37


AMBARI-17812 UT failure in trunk - test_start_default_embedded (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b887e1c9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b887e1c9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b887e1c9

Branch: refs/heads/branch-2.4
Commit: b887e1c99c940fb79661aeecb74932240288a2e3
Parents: 3e636b5
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed Jul 20 18:17:12 2016 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Wed Jul 20 20:03:28 2016 +0300

----------------------------------------------------------------------
 .../python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py  | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b887e1c9/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
index 37e6ee1..ea43824 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_collector.py
@@ -101,9 +101,6 @@ class TestMetricsCollector(RMFTestCase):
     )
     self.assertResourceCalled('Execute', 'ambari-sudo.sh rm -rf /var/lib/ambari-metrics-collector/hbase-tmp/*.tmp',
     )
-    self.assertResourceCalled('Directory', '/var/lib/ambari-metrics-collector/hbase-tmp/zookeeper',
-                              action = ['delete']
-    )
 
     self.assertResourceCalled('File', '/etc/ambari-metrics-collector/conf/core-site.xml',
                                 owner = 'ams',


[2/2] ambari git commit: AMBARI-17809 DataNode failed to start because of "small initial heap" (dsen)

Posted by ds...@apache.org.
AMBARI-17809 DataNode failed to start because of "small initial heap" (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b940d7a3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b940d7a3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b940d7a3

Branch: refs/heads/branch-2.4
Commit: b940d7a3722ea902aeb4674840c7ac3305d7b404
Parents: b887e1c
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed Jul 20 20:02:49 2016 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Wed Jul 20 20:03:56 2016 +0300

----------------------------------------------------------------------
 .../main/resources/stacks/HDP/2.5/services/stack_advisor.py  | 8 ++++----
 .../src/test/python/stacks/2.5/common/test_stack_advisor.py  | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b940d7a3/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index b8f3074..616516e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -42,10 +42,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
         falconUser = services["configurations"]["falcon-env"]["properties"]["falcon_user"]
       else :
         falconUser = 'falcon'
-    oozieUser = services["configurations"]["oozie-env"]["properties"]["oozie_user"]
-    newAdminUsers = "{0},oozie-admin,{1}".format(oozieUser, falconUser)
-    services["forced-configurations"].append({"type" : "oozie-env", "name" : "oozie_admin_users"})
-    putOozieEnvProperty("oozie_admin_users", newAdminUsers)
+      oozieUser = services["configurations"]["oozie-env"]["properties"]["oozie_user"]
+      newAdminUsers = "{0},oozie-admin,{1}".format(oozieUser, falconUser)
+      services["forced-configurations"].append({"type" : "oozie-env", "name" : "oozie_admin_users"})
+      putOozieEnvProperty("oozie_admin_users", newAdminUsers)
 
 
   def createComponentLayoutRecommendations(self, services, hosts):

http://git-wip-us.apache.org/repos/asf/ambari/blob/b940d7a3/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index ca49d9b..7c8a6e7 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -58,7 +58,6 @@ class TestHDP25StackAdvisor(TestCase):
     self.get_system_min_uid_real = self.stackAdvisor.get_system_min_uid
     self.stackAdvisor.get_system_min_uid = self.get_system_min_uid_magic
 
-
     # setup for 'test_recommendYARNConfigurations'
     self.hosts = {
       "items": [