You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/09/12 00:54:29 UTC
[2/2] ambari git commit: AMBARI-12837. Propogate service type
information to dictionary (Vijay Srinivasaraghavan via smohanty)
AMBARI-12837. Propogate service type information to dictionary (Vijay Srinivasaraghavan via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93a2106a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93a2106a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93a2106a
Branch: refs/heads/trunk
Commit: 93a2106a6edb8ae26dc30a0b277ec0de586b8d05
Parents: 02fcea6
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Sep 11 15:54:00 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Sep 11 15:54:00 2015 -0700
----------------------------------------------------------------------
.../libraries/providers/hdfs_resource.py | 14 ++++++++----
.../libraries/resources/hdfs_resource.py | 3 +++
.../AmbariCustomCommandExecutionHelper.java | 14 ++++++++++++
.../AmbariManagementControllerImpl.java | 19 ++++++++++++----
.../1.6.1.2.2.0/package/scripts/params.py | 6 ++++-
.../0.1.0/package/scripts/hbase.py | 6 +++--
.../0.1.0/package/scripts/params_linux.py | 3 +++
.../0.5.0.2.1/package/scripts/params_linux.py | 5 +++-
.../0.96.0.2.0/package/scripts/params_linux.py | 7 ++++--
.../2.1.0.2.0/package/scripts/params_linux.py | 5 +++-
.../0.12.0.2.0/package/scripts/params_linux.py | 5 +++-
.../MAHOUT/1.0.0.2.3/package/scripts/params.py | 5 +++-
.../4.0.0.2.0/package/scripts/params_linux.py | 6 ++++-
.../0.12.0.2.0/package/scripts/params_linux.py | 5 +++-
.../SPARK/1.2.0.2.2/package/scripts/params.py | 4 +++-
.../0.4.0.2.1/package/scripts/params_linux.py | 5 +++-
.../package/scripts/mapred_service_check.py | 2 ++
.../2.1.0.2.0/package/scripts/params_linux.py | 7 ++++--
.../2.0.6/hooks/after-INSTALL/scripts/params.py | 4 ++--
.../scripts/shared_initialization.py | 4 ++--
.../HDP/2.0.6/hooks/before-ANY/scripts/hook.py | 2 +-
.../2.0.6/hooks/before-ANY/scripts/params.py | 4 ++--
.../before-ANY/scripts/shared_initialization.py | 4 ++--
.../2.0.6/hooks/before-START/scripts/params.py | 5 ++--
.../scripts/shared_initialization.py | 11 +++++----
.../AMBARI_METRICS/test_metrics_collector.py | 2 ++
.../stacks/2.0.6/HBASE/test_hbase_master.py | 9 ++++++++
.../python/stacks/2.0.6/HDFS/test_namenode.py | 24 ++++++++++++++++++++
.../stacks/2.0.6/HDFS/test_service_check.py | 4 ++++
.../stacks/2.0.6/HIVE/test_hive_server.py | 14 ++++++++++++
.../2.0.6/HIVE/test_hive_service_check.py | 6 +++++
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 18 ++++++++++++++-
.../stacks/2.0.6/OOZIE/test_service_check.py | 9 ++++++++
.../stacks/2.0.6/PIG/test_pig_service_check.py | 6 +++++
.../stacks/2.0.6/YARN/test_historyserver.py | 16 ++++++++++++-
.../2.0.6/YARN/test_mapreduce2_service_check.py | 6 +++++
.../stacks/2.1/FALCON/test_falcon_server.py | 6 +++++
.../python/stacks/2.1/TEZ/test_service_check.py | 3 +++
.../stacks/2.2/PIG/test_pig_service_check.py | 6 +++++
.../stacks/2.2/SPARK/test_job_history_server.py | 6 +++++
.../2.3/MAHOUT/test_mahout_service_check.py | 4 ++++
ambari-web/app/data/HDP2/site_properties.js | 15 ++++++++++++
.../ambari/fast_hdfs_resource/Runner.java | 8 +++++--
43 files changed, 272 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
index 1d1aeba..ea3acdf 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
@@ -50,7 +50,8 @@ RESOURCE_TO_JSON_FIELDS = {
'mode': 'mode',
'recursive_chown': 'recursiveChown',
'recursive_chmod': 'recursiveChmod',
- 'change_permissions_for_parents': 'changePermissionforParents'
+ 'change_permissions_for_parents': 'changePermissionforParents',
+ 'dfs_type': 'dfs_type'
}
class HdfsResourceJar:
@@ -381,9 +382,10 @@ class HdfsResourceWebHDFS:
class HdfsResourceProvider(Provider):
def __init__(self, resource):
super(HdfsResourceProvider,self).__init__(resource)
- self.assert_parameter_is_set('hdfs_site')
-
- self.webhdfs_enabled = self.resource.hdfs_site['dfs.webhdfs.enabled']
+ self.fsType = getattr(resource, 'dfs_type')
+ if self.fsType != 'HCFS':
+ self.assert_parameter_is_set('hdfs_site')
+ self.webhdfs_enabled = self.resource.hdfs_site['dfs.webhdfs.enabled']
def action_delayed(self, action_name):
self.assert_parameter_is_set('type')
@@ -400,7 +402,9 @@ class HdfsResourceProvider(Provider):
self.get_hdfs_resource_executor().action_execute(self)
def get_hdfs_resource_executor(self):
- if WebHDFSUtil.is_webhdfs_available(self.webhdfs_enabled, self.resource.default_fs):
+ if self.fsType == 'HCFS':
+ return HdfsResourceJar()
+ elif WebHDFSUtil.is_webhdfs_available(self.webhdfs_enabled, self.resource.default_fs):
return HdfsResourceWebHDFS()
else:
return HdfsResourceJar()
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py b/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
index 69aeab0..7c12409 100644
--- a/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
+++ b/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
@@ -80,6 +80,9 @@ class HdfsResource(Resource):
hdfs_site = ResourceArgument()
default_fs = ResourceArgument()
+ # To support HCFS
+ dfs_type = ResourceArgument(default="")
+
#action 'execute' immediately creates all pending files/directories in efficient manner
#action 'create_delayed/delete_delayed' adds file/directory to list of pending directories
actions = Resource.actions + ["create_on_execute", "delete_on_execute", "execute"]
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 2bda16e..c869956 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -48,6 +48,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Iterator;
import java.util.Set;
import java.util.TreeMap;
@@ -1059,6 +1060,19 @@ public class AmbariCustomCommandExecutionHelper {
hostParamsStage.put(CLIENTS_TO_UPDATE_CONFIGS, clientsToUpdateConfigs);
}
clusterHostInfoJson = StageUtils.getGson().toJson(clusterHostInfo);
+
+ //Propogate HCFS service type info to command params
+ Iterator<Service> it = cluster.getServices().values().iterator();
+ while(it.hasNext()) {
+ ServiceInfo serviceInfoInstance = ambariMetaInfo.getService(stackId.getStackName(),stackId.getStackVersion(), it.next().getName());
+ LOG.info("Iterating service type Instance in getCommandJson:: " + serviceInfoInstance.getName());
+ if(serviceInfoInstance.getServiceType() != null) {
+ LOG.info("Adding service type info in getCommandJson:: " + serviceInfoInstance.getServiceType());
+ commandParamsStage.put("dfs_type",serviceInfoInstance.getServiceType());
+ break;
+ }
+ }
+
}
String hostParamsStageJson = StageUtils.getGson().toJson(hostParamsStage);
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index f27e388..37de331 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -50,6 +50,7 @@ import java.util.Collections;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -1882,20 +1883,28 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
}
- LOG.info("Adding service type info in createHostAction:: " + serviceInfo.getServiceType());
- execCmd.setServiceType(serviceInfo.getServiceType());
-
execCmd.setConfigurations(configurations);
execCmd.setConfigurationAttributes(configurationAttributes);
execCmd.setConfigurationTags(configTags);
-
-
// Create a local copy for each command
Map<String, String> commandParams = new TreeMap<String, String>();
if (commandParamsInp != null) { // if not defined
commandParams.putAll(commandParamsInp);
}
+
+ //Propogate HCFS service type info
+ Iterator<Service> it = cluster.getServices().values().iterator();
+ while(it.hasNext()) {
+ ServiceInfo serviceInfoInstance = ambariMetaInfo.getService(stackId.getStackName(),stackId.getStackVersion(), it.next().getName());
+ LOG.info("Iterating service type Instance in createHostAction:: " + serviceInfoInstance.getName());
+ if(serviceInfoInstance.getServiceType() != null) {
+ LOG.info("Adding service type info in createHostAction:: " + serviceInfoInstance.getServiceType());
+ commandParams.put("dfs_type",serviceInfoInstance.getServiceType());
+ break;
+ }
+ }
+
boolean isInstallCommand = roleCommand.equals(RoleCommand.INSTALL);
String agentDefaultCommandTimeout = configs.getDefaultAgentTaskTimeout(isInstallCommand);
String scriptCommandTimeout = "";
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
index 8e55659..ca8cebe 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
@@ -158,6 +158,9 @@ hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_nam
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+
+dfs_type = default("/commandParams/dfs_type", "")
+
# dfs.namenode.https-address
import functools
#create partial functions with common arguments for every HdfsResource call
@@ -172,5 +175,6 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
index bb3f17f..b42c033 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
@@ -183,14 +183,16 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
type="directory",
action="create_on_execute",
owner=params.hbase_user,
- mode=0775
+ mode=0775,
+ dfs_type=params.dfs_type
)
params.HdfsResource(params.hbase_staging_dir,
type="directory",
action="create_on_execute",
owner=params.hbase_user,
- mode=0711
+ mode=0711,
+ dfs_type=params.dfs_type
)
params.HdfsResource(None, action="execute")
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
index 838e987..21b491d 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
@@ -48,3 +48,6 @@ hbase_conf_dir = "/etc/ams-hbase/conf"
limits_conf_dir = "/etc/security/limits.d"
sudo = AMBARI_SUDO_BINARY
+
+dfs_type = default("/commandParams/dfs_type", "")
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
index d79026a..b150464 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
@@ -111,6 +111,8 @@ dfs_data_mirroring_dir = "/apps/data-mirroring"
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+dfs_type = default("/commandParams/dfs_type", "")
+
import functools
#create partial functions with common arguments for every HdfsResource call
#to create/delete hdfs directory/file/copyfromlocal we need to call params.HdfsResource in code
@@ -124,6 +126,7 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 54bf7e7..dad9658 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -35,7 +35,6 @@ from resource_management.libraries.functions import is_empty
from resource_management.libraries.functions import get_unique_id_and_date
from resource_management.libraries.script.script import Script
-
from resource_management.libraries.functions.substitute_vars import substitute_vars
# server configurations
@@ -188,6 +187,9 @@ hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_nam
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+
+dfs_type = default("/commandParams/dfs_type", "")
+
import functools
#create partial functions with common arguments for every HdfsResource call
#to create/delete hdfs directory/file/copyfromlocal we need to call params.HdfsResource in code
@@ -201,7 +203,8 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
# ranger host
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index 3160af2..4302976 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -313,6 +313,8 @@ else:
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+dfs_type = default("/commandParams/dfs_type", "")
+
import functools
#create partial functions with common arguments for every HdfsResource call
#to create/delete/copyfromlocal hdfs directories/files we need to call params.HdfsResource in code
@@ -326,7 +328,8 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 08906cb..eea2c00 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -443,6 +443,8 @@ security_param = "true" if security_enabled else "false"
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+dfs_type = default("/commandParams/dfs_type", "")
+
import functools
#create partial functions with common arguments for every HdfsResource call
#to create hdfs directory we need to call params.HdfsResource in code
@@ -456,7 +458,8 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py
index e432c36..fd5565b 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/params.py
@@ -71,6 +71,8 @@ log4j_props = config['configurations']['mahout-log4j']['content']
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+dfs_type = default("/commandParams/dfs_type", "")
+
import functools
#create partial functions with common arguments for every HdfsResource call
#to create/delete hdfs directory/file/copyfromlocal we need to call params.HdfsResource in code
@@ -84,5 +86,6 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 6935e93..e6b47b0 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -246,6 +246,9 @@ hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_nam
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+
+dfs_type = default("/commandParams/dfs_type", "")
+
import functools
#create partial functions with common arguments for every HdfsResource call
#to create/delete hdfs directory/file/copyfromlocal we need to call params.HdfsResource in code
@@ -259,7 +262,8 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
is_webhdfs_enabled = config['configurations']['hdfs-site']['dfs.webhdfs.enabled']
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py
index 84b34b2..f923723 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params_linux.py
@@ -75,6 +75,8 @@ log4j_props = config['configurations']['pig-log4j']['content']
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+dfs_type = default("/commandParams/dfs_type", "")
+
import functools
#create partial functions with common arguments for every HdfsResource call
#to create hdfs directory we need to call params.HdfsResource in code
@@ -88,6 +90,7 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index dfe5e7b..b7aeba9 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -156,6 +156,7 @@ if security_enabled:
default_fs = config['configurations']['core-site']['fs.defaultFS']
hdfs_site = config['configurations']['hdfs-site']
+dfs_type = default("/commandParams/dfs_type", "")
import functools
#create partial functions with common arguments for every HdfsResource call
@@ -170,5 +171,6 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_linux.py
index 31e1a7c..25f867e 100644
--- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params_linux.py
@@ -79,6 +79,8 @@ tez_env_sh_template = config['configurations']['tez-env']['content']
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+dfs_type = default("/commandParams/dfs_type", "")
+
import functools
#create partial functions with common arguments for every HdfsResource call
#to create/delete/copyfromlocal hdfs directories/files we need to call params.HdfsResource in code
@@ -92,7 +94,8 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapred_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapred_service_check.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapred_service_check.py
index f7fafd8..3edfd7b 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapred_service_check.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/mapred_service_check.py
@@ -123,11 +123,13 @@ class MapReduce2ServiceCheckDefault(MapReduce2ServiceCheck):
params.HdfsResource(output_file,
action = "delete_on_execute",
type = "directory",
+ dfs_type = params.dfs_type,
)
params.HdfsResource(input_file,
action = "create_on_execute",
type = "file",
source = "/etc/passwd",
+ dfs_type = params.dfs_type,
)
params.HdfsResource(None, action="execute")
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index 9b242ea..6905587 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -30,7 +30,6 @@ from resource_management.libraries.functions.version import format_hdp_stack_ver
from resource_management.libraries.functions.default import default
from resource_management.libraries import functions
-
import status_params
# a map of the Ambari role to the component name
@@ -250,6 +249,9 @@ hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_nam
hdfs_site = config['configurations']['hdfs-site']
default_fs = config['configurations']['core-site']['fs.defaultFS']
+dfs_type = default("/commandParams/dfs_type", "")
+
+
import functools
#create partial functions with common arguments for every HdfsResource call
#to create/delete hdfs directory/file/copyfromlocal we need to call params.HdfsResource in code
@@ -263,7 +265,8 @@ HdfsResource = functools.partial(
hadoop_conf_dir = hadoop_conf_dir,
principal_name = hdfs_principal_name,
hdfs_site = hdfs_site,
- default_fs = default_fs
+ default_fs = default_fs,
+ dfs_type = dfs_type
)
update_exclude_file_only = default("/commandParams/update_exclude_file_only",False)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py
index 3358fa4..4aa5f8a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py
@@ -30,7 +30,7 @@ from ambari_commons.os_check import OSCheck
config = Script.get_config()
-service_type = default("serviceType","")
+dfs_type = default("/commandParams/dfs_type", "")
sudo = AMBARI_SUDO_BINARY
@@ -91,5 +91,5 @@ user_group = config['configurations']['cluster-env']['user_group']
namenode_host = default("/clusterHostInfo/namenode_host", [])
has_namenode = not len(namenode_host) == 0
-if has_namenode:
+if has_namenode or dfs_type == 'HCFS':
hadoop_conf_dir = conf_select.get_hadoop_conf_dir(force_latest_on_upgrade=True)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
index 3d8d286..d3b1448 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
@@ -45,8 +45,8 @@ def setup_hdp_install_directory():
def setup_config():
import params
stackversion = params.stack_version_unformatted
- Logger.info("Service Type: {0}".format(params.service_type))
- if params.has_namenode or stackversion.find('Gluster') >= 0 or params.service_type == 'HCFS':
+ Logger.info("FS Type: {0}".format(params.dfs_type))
+ if params.has_namenode or stackversion.find('Gluster') >= 0 or params.dfs_type == 'HCFS':
# create core-site only if the hadoop config diretory exists
XmlConfig("core-site.xml",
conf_dir=params.hadoop_conf_dir,
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/hook.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/hook.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/hook.py
index 18dd49e..c34be0b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/hook.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/hook.py
@@ -27,7 +27,7 @@ class BeforeAnyHook(Hook):
env.set_params(params)
setup_users()
- if params.has_namenode:
+ if params.has_namenode or params.dfs_type == 'HCFS':
setup_hadoop_env()
setup_java()
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index ea3e866..fb70dac 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -38,7 +38,7 @@ from ambari_commons.constants import AMBARI_SUDO_BINARY
config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
-service_type = default("serviceType","")
+dfs_type = default("/commandParams/dfs_type", "")
artifact_dir = format("{tmp_dir}/AMBARI-artifacts/")
jdk_name = default("/hostLevelParams/jdk_name", None)
@@ -180,7 +180,7 @@ has_oozie_server = not len(oozie_servers) == 0
has_falcon_server_hosts = not len(falcon_server_hosts) == 0
has_ranger_admin = not len(ranger_admin_hosts) == 0
-if has_namenode:
+if has_namenode or dfs_type == 'HCFS':
hadoop_conf_dir = conf_select.get_hadoop_conf_dir(force_latest_on_upgrade=True)
hbase_tmp_dir = "/tmp/hbase-hbase"
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
index 420c364..3bd0f53 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
@@ -132,8 +132,8 @@ def set_uid(user, user_dirs):
def setup_hadoop_env():
import params
stackversion = params.stack_version_unformatted
- Logger.info("Service Type: {0}".format(params.service_type))
- if params.has_namenode or stackversion.find('Gluster') >= 0 or params.service_type == 'HCFS':
+ Logger.info("FS Type: {0}".format(params.dfs_type))
+ if params.has_namenode or stackversion.find('Gluster') >= 0 or params.dfs_type == 'HCFS':
if params.security_enabled:
tc_owner = "root"
else:
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index 3c4a2e7..e771dd5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@ -28,12 +28,13 @@ from resource_management.libraries.functions.version import format_hdp_stack_ver
from ambari_commons.os_check import OSCheck
from resource_management.libraries.script.script import Script
-
config = Script.get_config()
stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
+dfs_type = default("/commandParams/dfs_type", "")
+
# hadoop default params
mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*"
@@ -108,7 +109,7 @@ metrics_collection_period = default("/configurations/ams-site/timeline.metrics.s
#hadoop params
-if has_namenode:
+if has_namenode or dfs_type == 'HCFS':
hadoop_tmp_dir = format("/tmp/hadoop-{hdfs_user}")
hadoop_conf_dir = conf_select.get_hadoop_conf_dir(force_latest_on_upgrade=True)
task_log4j_properties_location = os.path.join(hadoop_conf_dir, "task-log4j.properties")
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
index 3422f76..e1ed8bf 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
@@ -35,7 +35,7 @@ def setup_hadoop():
)
#directories
- if params.has_namenode:
+ if params.has_namenode or params.dfs_type == 'HCFS':
Directory(params.hdfs_log_dir_prefix,
recursive=True,
owner='root',
@@ -43,12 +43,13 @@ def setup_hadoop():
mode=0775,
cd_access='a',
)
- Directory(params.hadoop_pid_dir_prefix,
+ if params.has_namenode:
+ Directory(params.hadoop_pid_dir_prefix,
recursive=True,
owner='root',
group='root',
cd_access='a',
- )
+ )
Directory(params.hadoop_tmp_dir,
recursive=True,
owner=params.hdfs_user,
@@ -61,7 +62,7 @@ def setup_hadoop():
tc_owner = params.hdfs_user
# if WebHDFS is not enabled we need this jar to create hadoop folders.
- if not WebHDFSUtil.is_webhdfs_available(params.is_webhdfs_enabled, params.default_fs):
+ if params.dfs_type == 'HCFS' or not WebHDFSUtil.is_webhdfs_available(params.is_webhdfs_enabled, params.default_fs):
# for source-code of jar goto contrib/fast-hdfs-resource
File(format("{ambari_libs_dir}/fast-hdfs-resource.jar"),
mode=0644,
@@ -107,7 +108,7 @@ def setup_configs():
"""
import params
- if params.has_namenode:
+ if params.has_namenode or params.dfs_type == 'HCFS':
if os.path.exists(params.hadoop_conf_dir):
File(params.task_log4j_properties_location,
content=StaticFile("task-log4j.properties"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/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 34135ff..7f54069 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
@@ -217,6 +217,7 @@ class TestOozieClient(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'ams',
mode = 0775,
hadoop_conf_dir = '/etc/hadoop/conf',
@@ -232,6 +233,7 @@ class TestOozieClient(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'ams',
mode = 0711,
hadoop_conf_dir = '/etc/hadoop/conf',
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/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 8f56e8f..f872d04 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
@@ -281,6 +281,7 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hbase',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -293,6 +294,7 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hbase',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
@@ -306,6 +308,7 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -397,6 +400,7 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hbase',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -409,6 +413,7 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hbase',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
@@ -422,6 +427,7 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -524,6 +530,7 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
owner = 'hbase',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -538,6 +545,7 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
owner = 'hbase',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -553,6 +561,7 @@ class TestHBaseMaster(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/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 b242c87..b9211a5 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
@@ -104,6 +104,7 @@ class TestNamenode(RMFTestCase):
principal_name = None,
user = 'hdfs',
owner = 'hdfs',
+ dfs_type = '',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
action = ['create_on_execute'],
@@ -119,6 +120,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -135,6 +137,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -214,6 +217,7 @@ class TestNamenode(RMFTestCase):
principal_name = None,
user = 'hdfs',
owner = 'hdfs',
+ dfs_type = '',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
action = ['create_on_execute'],
@@ -230,6 +234,7 @@ class TestNamenode(RMFTestCase):
principal_name = None,
user = 'hdfs',
owner = 'ambari-qa',
+ dfs_type = '',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
action = ['create_on_execute'],
@@ -245,6 +250,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -343,6 +349,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
owner = 'hdfs',
+ dfs_type = '',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
@@ -355,6 +362,7 @@ class TestNamenode(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -369,6 +377,7 @@ class TestNamenode(RMFTestCase):
hadoop_bin_dir = '/usr/bin',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -446,6 +455,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -462,6 +472,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -478,6 +489,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -537,6 +549,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
+ dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -553,6 +566,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -569,6 +583,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -637,6 +652,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -653,6 +669,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -669,6 +686,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -736,6 +754,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -752,6 +771,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -768,6 +788,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -843,6 +864,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -859,6 +881,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -875,6 +898,7 @@ class TestNamenode(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
index 3084528..0f5afa8 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
@@ -68,6 +68,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['create_on_execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -82,6 +83,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['delete_on_execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -96,6 +98,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['create_on_execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -109,6 +112,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = None,
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index 83328c1..ef1ce7f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -299,6 +299,7 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hcat',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -311,6 +312,7 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hcat',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -328,6 +330,7 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hive',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -340,6 +343,7 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hive',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -353,6 +357,7 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hive',
group = 'hdfs',
hadoop_bin_dir = '/usr/bin',
@@ -366,6 +371,7 @@ class TestHiveServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='missing_principal', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -481,6 +487,7 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hcat',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -493,6 +500,7 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hcat',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -506,6 +514,7 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hive',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -518,6 +527,7 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hive',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -530,6 +540,7 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hive',
group = 'hdfs',
hadoop_bin_dir = '/usr/bin',
@@ -543,6 +554,7 @@ class TestHiveServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -876,6 +888,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='missing_principal', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
@@ -914,6 +927,7 @@ From source with checksum 150f554beae04f76f814f59549dead8b"""
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='missing_principal', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
index 00439a8..b755d46 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
@@ -99,6 +99,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'missing_principal',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -114,6 +115,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'missing_principal',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -128,6 +130,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'missing_principal',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -209,6 +212,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -224,6 +228,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -238,6 +243,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index b8483f4..9cf426f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -69,6 +69,7 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'oozie',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -81,6 +82,7 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -272,6 +274,7 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
owner = 'oozie',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -287,6 +290,7 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -487,6 +491,7 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
+ dfs_type = '',
hdfs_site = self.getConfig()['configurations']['hdfs-site'],
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
@@ -505,6 +510,7 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -576,6 +582,7 @@ class TestOozieServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
+ dfs_type = '',
hdfs_site = self.getConfig()['configurations']['hdfs-site'],
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
@@ -594,6 +601,7 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -630,6 +638,7 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'oozie',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
@@ -642,6 +651,7 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -806,6 +816,7 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'oozie',
hadoop_bin_dir = '/usr/bin',
type = 'directory',
@@ -819,6 +830,7 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -1339,6 +1351,7 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
+ dfs_type = '',
hdfs_site = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
@@ -1358,7 +1371,8 @@ class TestOozieServer(RMFTestCase):
hdfs_site = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
- user = 'hdfs',
+ user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf' )
@@ -1410,6 +1424,7 @@ class TestOozieServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
+ dfs_type = '',
hdfs_site = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
@@ -1430,6 +1445,7 @@ class TestOozieServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf' )
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
index be807b2..4033534 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
@@ -88,8 +88,10 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
+ dfs_type = '',
type = 'directory',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/examples',
@@ -99,10 +101,12 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '//examples',
user = 'hdfs',
+ dfs_type = '',
action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
owner = 'ambari-qa',
+ dfs_type = '',
group = 'hadoop'
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/input-data',
@@ -111,8 +115,10 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
+ dfs_type = '',
type = 'directory',
)
self.assertResourceCalled('HdfsResource', '/user/ambari-qa/input-data',
@@ -122,10 +128,12 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '//examples/input-data',
user = 'hdfs',
+ dfs_type = '',
action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
owner = 'ambari-qa',
+ dfs_type = '',
group = 'hadoop'
)
self.assertResourceCalled('HdfsResource', None,
@@ -134,6 +142,7 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
index 4a87f4b..c5de4c3 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py
@@ -43,6 +43,7 @@ class TestPigServiceCheck(RMFTestCase):
user = 'hdfs',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
+ dfs_type = '',
type = 'directory',
action = ['delete_on_execute'],
)
@@ -58,6 +59,7 @@ class TestPigServiceCheck(RMFTestCase):
user = 'hdfs',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
+ dfs_type = '',
type = 'file',
action = ['create_on_execute'],
)
@@ -70,6 +72,7 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -111,6 +114,7 @@ class TestPigServiceCheck(RMFTestCase):
hdfs_site = self.getConfig()['configurations']['hdfs-site'],
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
+ dfs_type = '',
user = 'hdfs',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
@@ -128,6 +132,7 @@ class TestPigServiceCheck(RMFTestCase):
principal_name = 'hdfs',
user = 'hdfs',
owner = 'ambari-qa',
+ dfs_type = '',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
action = ['create_on_execute'],
@@ -141,6 +146,7 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/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 45c7978..b6d5f42 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
@@ -61,6 +61,7 @@ class TestHistoryServer(RMFTestCase):
type="directory",
action=["create_on_execute"],
user=u"hdfs",
+ dfs_type = '',
owner=u"tez",
mode=493,
hadoop_bin_dir="/usr/bin",
@@ -78,6 +79,7 @@ class TestHistoryServer(RMFTestCase):
action=["create_on_execute"],
user=u'hdfs',
owner=u"tez",
+ dfs_type = '',
mode=493,
hadoop_bin_dir="/usr/bin",
hadoop_conf_dir="/etc/hadoop/conf",
@@ -93,6 +95,7 @@ class TestHistoryServer(RMFTestCase):
action=['execute'],
user=u'hdfs',
hadoop_bin_dir="/usr/bin",
+ dfs_type = '',
hadoop_conf_dir="/etc/hadoop/conf",
hdfs_site=self.getConfig()["configurations"]["hdfs-site"],
default_fs=u'hdfs://c6401.ambari.apache.org:8020',
@@ -193,6 +196,7 @@ class TestHistoryServer(RMFTestCase):
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
kinit_path_local = '/usr/bin/kinit',
recursive_chmod = True,
owner = 'yarn',
@@ -207,7 +211,8 @@ class TestHistoryServer(RMFTestCase):
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
- user = 'hdfs',
+ user = 'hdfs',
+ dfs_type = '',
owner = 'mapred',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -219,6 +224,7 @@ class TestHistoryServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -231,6 +237,7 @@ class TestHistoryServer(RMFTestCase):
change_permissions_for_parents = True,
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'mapred',
group = 'hadoop',
hadoop_bin_dir = '/usr/bin',
@@ -244,6 +251,7 @@ class TestHistoryServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -416,6 +424,7 @@ class TestHistoryServer(RMFTestCase):
hadoop_conf_dir = '/etc/hadoop/conf',
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
user = 'hdfs',
+ dfs_type = '',
kinit_path_local = '/usr/bin/kinit',
recursive_chmod = True,
owner = 'yarn',
@@ -431,6 +440,7 @@ class TestHistoryServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'mapred',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -442,6 +452,7 @@ class TestHistoryServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'hdfs',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -454,6 +465,7 @@ class TestHistoryServer(RMFTestCase):
change_permissions_for_parents = True,
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'mapred',
group = 'hadoop',
hadoop_bin_dir = '/usr/bin',
@@ -467,6 +479,7 @@ class TestHistoryServer(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -775,6 +788,7 @@ class TestHistoryServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
index d80862b..54ecf33 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_service_check.py
@@ -45,6 +45,7 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -56,6 +57,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '/etc/passwd',
user = 'hdfs',
+ dfs_type = '',
action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -66,6 +68,7 @@ class TestServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -99,6 +102,7 @@ class TestServiceCheck(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['delete_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -110,6 +114,7 @@ class TestServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '/etc/passwd',
user = 'hdfs',
+ dfs_type = '',
action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -120,6 +125,7 @@ class TestServiceCheck(RMFTestCase):
keytab = '/etc/security/keytabs/hdfs.headless.keytab',
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
index 793e8dc..c9166a5 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
@@ -133,6 +133,7 @@ class TestFalconServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'falcon',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -149,6 +150,7 @@ class TestFalconServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'falcon',
group='users',
hadoop_conf_dir = '/etc/hadoop/conf',
@@ -166,6 +168,7 @@ class TestFalconServer(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
@@ -312,6 +315,7 @@ class TestFalconServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
owner = 'falcon',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -329,6 +333,7 @@ class TestFalconServer(RMFTestCase):
source = '/usr/hdp/current/falcon-server/data-mirroring',
default_fs = 'hdfs://c6401.ambari.apache.org:8020',
user = 'hdfs',
+ dfs_type = '',
hdfs_site = self.getConfig()['configurations']['hdfs-site'],
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
@@ -350,6 +355,7 @@ class TestFalconServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = UnknownConfigurationMock(),
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
index c8e4cdc..e12dd07 100644
--- a/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.1/TEZ/test_service_check.py
@@ -43,6 +43,7 @@ class TestTezServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
@@ -55,6 +56,7 @@ class TestTezServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
source = '/tmp/sample-tez-test',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'file',
@@ -66,6 +68,7 @@ class TestTezServiceCheck(RMFTestCase):
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name=UnknownConfigurationMock(), default_fs='hdfs://c6401.ambari.apache.org:8020',
hadoop_conf_dir = '/etc/hadoop/conf',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/93a2106a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
index 410bf93..bf42f9b 100644
--- a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py
@@ -46,6 +46,7 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -61,6 +62,7 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'file',
@@ -75,6 +77,7 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)
@@ -106,6 +109,7 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'directory',
@@ -121,6 +125,7 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
+ dfs_type = '',
owner = 'ambari-qa',
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
type = 'file',
@@ -137,6 +142,7 @@ class TestPigServiceCheck(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
principal_name = 'hdfs@EXAMPLE.COM',
user = 'hdfs',
+ dfs_type = '',
action = ['execute'],
hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
)