ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-4629. Delimiter Comma not handled while creating NodeManager log and local directories (Eugene Chekanskiy via aonishuk)
Date Wed, 12 Feb 2014 16:36:52 GMT
Updated Branches:
  refs/heads/trunk 40319d893 -> 5fd74cbb3


AMBARI-4629. Delimiter Comma not handled while creating NodeManager log
and local directories (Eugene Chekanskiy via aonishuk)


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

Branch: refs/heads/trunk
Commit: 5fd74cbb3e0b072aa2864ff3a96e8d7763ac9b1c
Parents: 40319d8
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Wed Feb 12 08:36:00 2014 -0800
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Wed Feb 12 08:36:00 2014 -0800

----------------------------------------------------------------------
 .../HDP/2.0.6/services/YARN/package/scripts/yarn.py      | 11 +++++++++--
 .../test/python/stacks/2.0.6/YARN/test_historyserver.py  |  8 ++++++++
 .../python/stacks/2.0.6/YARN/test_mapreduce2_client.py   |  8 ++++++++
 .../test/python/stacks/2.0.6/YARN/test_nodemanager.py    |  8 ++++++++
 .../python/stacks/2.0.6/YARN/test_resourcemanager.py     |  8 ++++++++
 .../test/python/stacks/2.0.6/YARN/test_yarn_client.py    |  8 ++++++++
 .../src/test/python/stacks/2.0.6/configs/default.json    |  4 ++--
 .../python/stacks/2.1.1/YARN/test_apptimelineserver.py   |  8 ++++++++
 8 files changed, 59 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd74cbb/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py
index 2d9cb71..108eb89 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py
@@ -71,8 +71,15 @@ def yarn(name = None):
             group=params.user_group,
             recursive=True
   )
-
-  Directory([params.nm_local_dirs, params.nm_log_dirs, params.yarn_log_dir_prefix],
+  Directory(params.nm_local_dirs.split(','),
+            owner=params.yarn_user,
+            recursive=True
+  )
+  Directory(params.nm_log_dirs.split(','),
+            owner=params.yarn_user,
+            recursive=True
+  )
+  Directory(params.yarn_log_dir_prefix,
             owner=params.yarn_user,
             recursive=True
   )

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd74cbb/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
index 0c515b0..a1c80a1 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
@@ -194,10 +194,18 @@ class TestHistoryServer(RMFTestCase):
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/local1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/hadoop/yarn/log',
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/log1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/var/log/hadoop-yarn',
       owner = 'yarn',
       recursive = True,

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd74cbb/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py
index 0744349..7d2869c 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py
@@ -53,10 +53,18 @@ class TestMapReduce2Client(RMFTestCase):
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/local1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/hadoop/yarn/log',
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/log1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/var/log/hadoop-yarn',
       owner = 'yarn',
       recursive = True,

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd74cbb/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
index f4b9e8c..ec2624d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
@@ -194,10 +194,18 @@ class TestNodeManager(RMFTestCase):
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/local1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/hadoop/yarn/log',
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/log1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/var/log/hadoop-yarn',
       owner = 'yarn',
       recursive = True,

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd74cbb/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
index 57e0244..222416d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
@@ -134,10 +134,18 @@ class TestResourceManager(RMFTestCase):
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/local1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/hadoop/yarn/log',
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/log1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/var/log/hadoop-yarn',
       owner = 'yarn',
       recursive = True,

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd74cbb/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py
index 02d8af2..5b78999 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py
@@ -53,10 +53,18 @@ class TestYarnClient(RMFTestCase):
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/local1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/hadoop/yarn/log',
       owner = 'yarn',
       recursive = True,
     )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/log1',
+      owner = 'yarn',
+      recursive = True,
+    )
     self.assertResourceCalled('Directory', '/var/log/hadoop-yarn',
       owner = 'yarn',
       recursive = True,

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd74cbb/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 32717e1..d3d5ba3 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -448,7 +448,7 @@
         "yarn-site": {
             "yarn.nodemanager.disk-health-checker.min-healthy-disks": "0.25", 
             "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor",

-            "yarn.nodemanager.local-dirs": "/hadoop/yarn/local", 
+            "yarn.nodemanager.local-dirs": "/hadoop/yarn/local,/hadoop/yarn/local1",
             "yarn.resourcemanager.resource-tracker.address": "c6402.ambari.apache.org:8025",

             "yarn.nodemanager.remote-app-log-dir-suffix": "logs", 
             "yarn.resourcemanager.hostname": "c6402.ambari.apache.org", 
@@ -466,7 +466,7 @@
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
             "yarn.nodemanager.log.retain-second": "604800", 
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
-            "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
+            "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 
             "yarn.resourcemanager.am.max-attempts": "2", 
             "yarn.nodemanager.remote-app-log-dir": "/app-logs", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/5fd74cbb/ambari-server/src/test/python/stacks/2.1.1/YARN/test_apptimelineserver.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1.1/YARN/test_apptimelineserver.py b/ambari-server/src/test/python/stacks/2.1.1/YARN/test_apptimelineserver.py
index ce779e0..fc1f547 100644
--- a/ambari-server/src/test/python/stacks/2.1.1/YARN/test_apptimelineserver.py
+++ b/ambari-server/src/test/python/stacks/2.1.1/YARN/test_apptimelineserver.py
@@ -88,10 +88,18 @@ class TestAppTimelineServer(RMFTestCase):
                               owner = 'yarn',
                               recursive = True,
                               )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/local1',
+                              owner = 'yarn',
+                              recursive = True,
+                              )
     self.assertResourceCalled('Directory', '/hadoop/yarn/log',
                               owner = 'yarn',
                               recursive = True,
                               )
+    self.assertResourceCalled('Directory', '/hadoop/yarn/log1',
+                              owner = 'yarn',
+                              recursive = True,
+                              )
     self.assertResourceCalled('Directory', '/var/log/hadoop-yarn',
                               owner = 'yarn',
                               recursive = True,


Mime
View raw message