[3/5] ambari git commit: AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk)

2015-05-12 Thread aonishuk 
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2f35d48/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
index 583e6e9..1e75eb0 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
@@ -61,37 +61,35 @@ def yarn(name = None):
 @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
 def yarn(name = None):
   import params
-  if name in ["nodemanager","historyserver"]:
+  if name == "historyserver":
 if params.yarn_log_aggregation_enabled:
-  params.HdfsDirectory(params.yarn_nm_app_log_dir,
-   action="create_delayed",
+  params.HdfsResource(params.yarn_nm_app_log_dir,
+   action="create_on_execute",
+   type="directory",
owner=params.yarn_user,
group=params.user_group,
mode=0777,
recursive_chmod=True
   )
-params.HdfsDirectory("/mapred",
- action="create_delayed",
+params.HdfsResource("/mapred",
+ type="directory",
+ action="create_on_execute",
  owner=params.mapred_user
 )
-params.HdfsDirectory("/mapred/system",
- action="create_delayed",
+params.HdfsResource("/mapred/system",
+ type="directory",
+ action="create_on_execute",
  owner=params.hdfs_user
 )
-params.HdfsDirectory(params.mapreduce_jobhistory_intermediate_done_dir,
- action="create_delayed",
+params.HdfsResource(params.mapreduce_jobhistory_done_dir,
+ type="directory",
+ action="create_on_execute",
  owner=params.mapred_user,
  group=params.user_group,
+ change_permissions_for_parents=True,
  mode=0777
 )
-
-params.HdfsDirectory(params.mapreduce_jobhistory_done_dir,
- action="create_delayed",
- owner=params.mapred_user,
- group=params.user_group,
- mode=01777
-)
-params.HdfsDirectory(None, action="create")
+params.HdfsResource(None, action="execute")
 
   if name == "nodemanager":
 Directory(params.nm_local_dirs.split(',') + params.nm_log_dirs.split(','),
@@ -178,12 +176,14 @@ def yarn(name = None):
group=params.user_group
 )
 if not is_empty(params.node_label_enable) and params.node_label_enable or 
is_empty(params.node_label_enable) and params.node_labels_dir:
-  params.HdfsDirectory(params.node_labels_dir,
-   action="create",
+  params.HdfsResource(params.node_labels_dir,
+   type="directory",
+   action="create_on_execute",
owner=params.yarn_user,
group=params.user_group,
mode=0700
   )
+  params.HdfsResource(None, action="execute")
   elif name == 'apptimelineserver':
 Directory(params.ats_leveldb_dir,
owner=params.yarn_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/c2f35d48/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index b56d15a..cc404eb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -280,36 +280,42 @@ class TestHBaseMaster(RMFTestCase):
   owner='hbase',
   content='log4jproperties\nline2'
 )
-self.assertResourceCalled('HdfsDirectory', 
'hdfs://c6401.ambari.apache.org:8020/apps/hbase/data',
-  security_enabled = False,
-  keytab = UnknownConfigurationMock(),
-  conf_dir = '/etc/hadoop/conf',
-  hdfs_user = 'hdfs',
-  kinit_path_local = "/usr/bin/kinit",
-  owner = 'hbase',
-  bin_dir = '/usr/bin',
-  action = ['create_delayed'],
-

[3/5] ambari git commit: AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk)

2015-05-08 Thread aonishuk 
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
index 583e6e9..1e75eb0 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
@@ -61,37 +61,35 @@ def yarn(name = None):
 @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
 def yarn(name = None):
   import params
-  if name in ["nodemanager","historyserver"]:
+  if name == "historyserver":
 if params.yarn_log_aggregation_enabled:
-  params.HdfsDirectory(params.yarn_nm_app_log_dir,
-   action="create_delayed",
+  params.HdfsResource(params.yarn_nm_app_log_dir,
+   action="create_on_execute",
+   type="directory",
owner=params.yarn_user,
group=params.user_group,
mode=0777,
recursive_chmod=True
   )
-params.HdfsDirectory("/mapred",
- action="create_delayed",
+params.HdfsResource("/mapred",
+ type="directory",
+ action="create_on_execute",
  owner=params.mapred_user
 )
-params.HdfsDirectory("/mapred/system",
- action="create_delayed",
+params.HdfsResource("/mapred/system",
+ type="directory",
+ action="create_on_execute",
  owner=params.hdfs_user
 )
-params.HdfsDirectory(params.mapreduce_jobhistory_intermediate_done_dir,
- action="create_delayed",
+params.HdfsResource(params.mapreduce_jobhistory_done_dir,
+ type="directory",
+ action="create_on_execute",
  owner=params.mapred_user,
  group=params.user_group,
+ change_permissions_for_parents=True,
  mode=0777
 )
-
-params.HdfsDirectory(params.mapreduce_jobhistory_done_dir,
- action="create_delayed",
- owner=params.mapred_user,
- group=params.user_group,
- mode=01777
-)
-params.HdfsDirectory(None, action="create")
+params.HdfsResource(None, action="execute")
 
   if name == "nodemanager":
 Directory(params.nm_local_dirs.split(',') + params.nm_log_dirs.split(','),
@@ -178,12 +176,14 @@ def yarn(name = None):
group=params.user_group
 )
 if not is_empty(params.node_label_enable) and params.node_label_enable or 
is_empty(params.node_label_enable) and params.node_labels_dir:
-  params.HdfsDirectory(params.node_labels_dir,
-   action="create",
+  params.HdfsResource(params.node_labels_dir,
+   type="directory",
+   action="create_on_execute",
owner=params.yarn_user,
group=params.user_group,
mode=0700
   )
+  params.HdfsResource(None, action="execute")
   elif name == 'apptimelineserver':
 Directory(params.ats_leveldb_dir,
owner=params.yarn_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8dce44/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index b56d15a..cc404eb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -280,36 +280,42 @@ class TestHBaseMaster(RMFTestCase):
   owner='hbase',
   content='log4jproperties\nline2'
 )
-self.assertResourceCalled('HdfsDirectory', 
'hdfs://c6401.ambari.apache.org:8020/apps/hbase/data',
-  security_enabled = False,
-  keytab = UnknownConfigurationMock(),
-  conf_dir = '/etc/hadoop/conf',
-  hdfs_user = 'hdfs',
-  kinit_path_local = "/usr/bin/kinit",
-  owner = 'hbase',
-  bin_dir = '/usr/bin',
-  action = ['create_delayed'],
-