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/08/21 14:46:32 UTC

git commit: AMBARI-6971. Tests with ulimit are failing randomly (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/trunk 0883a75b2 -> d39b0e2cc


AMBARI-6971. Tests with ulimit are failing randomly (aonishuk)


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

Branch: refs/heads/trunk
Commit: d39b0e2cc3de8940d85b1467d68618b5f3886a0a
Parents: 0883a75
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Aug 21 15:46:24 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Aug 21 15:46:24 2014 +0300

----------------------------------------------------------------------
 .../stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py    | 5 +----
 .../stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py    | 5 +----
 .../src/test/python/stacks/1.3.2/HDFS/test_datanode.py          | 1 -
 .../src/test/python/stacks/1.3.2/HDFS/test_namenode.py          | 1 -
 .../src/test/python/stacks/1.3.2/HDFS/test_snamenode.py         | 1 -
 .../src/test/python/stacks/2.0.6/HDFS/test_datanode.py          | 1 -
 .../src/test/python/stacks/2.0.6/HDFS/test_journalnode.py       | 1 -
 .../src/test/python/stacks/2.0.6/HDFS/test_namenode.py          | 1 -
 .../src/test/python/stacks/2.0.6/HDFS/test_snamenode.py         | 1 -
 ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py    | 1 -
 10 files changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
index c68c982..df40ae2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
@@ -24,10 +24,7 @@ import os
 config = Script.get_config()
 tmp_dir = Script.get_tmp_dir()
 
-if System.get_instance().os_type == "oraclelinux":
-  ulimit_cmd = ''
-else:
-  ulimit_cmd = "ulimit -c unlimited; "
+ulimit_cmd = "ulimit -c unlimited; "
 
 #security params
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']

http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
index 6ad04b3..69b916d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
@@ -24,10 +24,7 @@ import os
 config = Script.get_config()
 tmp_dir = Script.get_tmp_dir()
 
-if System.get_instance().os_type == "oraclelinux":
-  ulimit_cmd = ''
-else:
-  ulimit_cmd = "ulimit -c unlimited; "
+ulimit_cmd = "ulimit -c unlimited; "
 
 #security params
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']

http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py
index 9308a69..70127b8 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_datanode.py
@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestDatanode(RMFTestCase):
 
   def test_configure_default(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
index a8f872e..fc87c79 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_namenode.py
@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestNamenode(RMFTestCase):
 
   def test_configure_default(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
index 303af35..50065e4 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HDFS/test_snamenode.py
@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestSNamenode(RMFTestCase):
 
   def test_configure_default(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
index 26d704a..6d8bad4 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestDatanode(RMFTestCase):
 
   def test_configure_default(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
index 9be3d6e..9d4e9db 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestJournalnode(RMFTestCase):
 
   def test_configure_default(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
index 71bb4fe..5e38f66 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
@@ -26,7 +26,6 @@ import resource_management
 import subprocess
 
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestNamenode(RMFTestCase):
 
   def test_configure_default(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
index 456f2d4..a675b33 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestSNamenode(RMFTestCase):
 
   def test_configure_default(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/d39b0e2c/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
index 9735615..be8d382 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
@@ -21,7 +21,6 @@ from ambari_commons import OSCheck
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
-@patch.object(OSCheck,"get_os_type", new = MagicMock(return_value='suse'))
 class TestZkfc(RMFTestCase):
 
   def test_start_default(self):