http://git-wip-us.apache.org/repos/asf/ambari/blob/4278c4a4/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py index 7835262..f9fb1f5 100644 --- a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py @@ -487,6 +487,8 @@ class TestHDP21StackAdvisor(TestCase): "hdfs-site": { "properties": { 'dfs.datanode.data.dir': '/hadoop/hdfs/data', + 'dfs.namenode.name.dir': '/hadoop/hdfs/namenode', + 'dfs.namenode.checkpoint.dir': '/hadoop/hdfs/namesecondary', 'dfs.datanode.du.reserved': '10240000000' } }
http://git-wip-us.apache.org/repos/asf/ambari/blob/4278c4a4/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py index dce32d3..9d8ba08 100644 --- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py @@ -3068,7 +3068,9 @@ class TestHDP22StackAdvisor(TestCase): 'dfs.namenode.safemode.threshold-pct': '1.000', 'dfs.datanode.failed.volumes.tolerated': '1', 'dfs.namenode.handler.count': '25', - 'dfs.datanode.data.dir': '/path/1,/path/2,/path/3,/path/4' + 'dfs.datanode.data.dir': '/path/1,/path/2,/path/3,/path/4', + 'dfs.namenode.name.dir': '/hadoop/hdfs/namenode', + 'dfs.namenode.checkpoint.dir': '/hadoop/hdfs/namesecondary' }, 'property_attributes': { 'dfs.datanode.failed.volumes.tolerated': {'maximum': '4'}, @@ -3681,12 +3683,9 @@ class TestHDP22StackAdvisor(TestCase): "cpu_count" : 6, "total_mem" : 50331648, "disk_info" : [ - {"mountpoint" : "/"}, - {"mountpoint" : "/dev/shm"}, - {"mountpoint" : "/vagrant"}, - {"mountpoint" : "/"}, - {"mountpoint" : "/dev/shm"}, - {"mountpoint" : "/vagrant"} + {"mountpoint" : "/", "type": "ext3"}, + {"mountpoint" : "/dev/shm", "type": "tmpfs"}, + {"mountpoint" : "/vagrant", "type": "vboxsf"} ], "public_host_name" : "c6401.ambari.apache.org", "host_name" : "c6401.ambari.apache.org" @@ -3736,15 +3735,19 @@ class TestHDP22StackAdvisor(TestCase): "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor", "yarn.nodemanager.linux-container-executor.cgroups.mount-path": "/cgroup", "yarn.nodemanager.container-executor.cgroups.mount": "true", - "yarn.nodemanager.resource.memory-mb": "39424", - "yarn.scheduler.minimum-allocation-mb": "3584", + "yarn.nodemanager.resource.memory-mb": "43008", + "yarn.scheduler.minimum-allocation-mb": "14336", "yarn.scheduler.maximum-allocation-vcores": "4", "yarn.scheduler.minimum-allocation-vcores": "1", "yarn.nodemanager.resource.cpu-vcores": "4", "yarn.nodemanager.container-executor.cgroups.hierarchy": " /yarn", - "yarn.scheduler.maximum-allocation-mb": "39424", + "yarn.scheduler.maximum-allocation-mb": "43008", "yarn.nodemanager.container-executor.resources-handler.class": "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler", - "hadoop.registry.rm.enabled": "false" + "hadoop.registry.rm.enabled": "false", + "yarn.timeline-service.leveldb-state-store.path": "/hadoop/yarn/timeline", + "yarn.timeline-service.leveldb-timeline-store.path": "/hadoop/yarn/timeline", + "yarn.nodemanager.local-dirs": "/hadoop/yarn/local", + "yarn.nodemanager.log-dirs": "/hadoop/yarn/log" }, "property_attributes": { "yarn.scheduler.minimum-allocation-vcores": { @@ -3757,18 +3760,19 @@ class TestHDP22StackAdvisor(TestCase): "maximum": "49152" }, "yarn.scheduler.minimum-allocation-mb": { - "maximum": "39424" + "maximum": "43008" }, "yarn.nodemanager.resource.cpu-vcores": { "maximum": "12" }, "yarn.scheduler.maximum-allocation-mb": { - "maximum": "39424" + "maximum": "43008" } } } } + hosts = self.stackAdvisor.filterHostMounts(hosts, services) clusterData = self.stackAdvisor.getConfigurationClusterSummary(servicesList, hosts, components, None) self.assertEquals(clusterData['hbaseRam'], 8) @@ -3792,15 +3796,19 @@ class TestHDP22StackAdvisor(TestCase): "yarn.nodemanager.linux-container-executor.cgroups.mount-path": "/cgroup", "yarn.nodemanager.linux-container-executor.group": "hadoop", "yarn.nodemanager.container-executor.cgroups.mount": "true", - "yarn.nodemanager.resource.memory-mb": "39424", - "yarn.scheduler.minimum-allocation-mb": "3584", + "yarn.nodemanager.resource.memory-mb": "43008", + "yarn.scheduler.minimum-allocation-mb": "14336", "yarn.scheduler.maximum-allocation-vcores": "4", "yarn.scheduler.minimum-allocation-vcores": "1", "yarn.nodemanager.resource.cpu-vcores": "4", "yarn.nodemanager.container-executor.cgroups.hierarchy": " /yarn", - "yarn.scheduler.maximum-allocation-mb": "39424", + "yarn.scheduler.maximum-allocation-mb": "43008", "yarn.nodemanager.container-executor.resources-handler.class": "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler", - "hadoop.registry.rm.enabled": "false" + "hadoop.registry.rm.enabled": "false", + "yarn.timeline-service.leveldb-state-store.path": "/hadoop/yarn/timeline", + "yarn.timeline-service.leveldb-timeline-store.path": "/hadoop/yarn/timeline", + "yarn.nodemanager.local-dirs": "/hadoop/yarn/local", + "yarn.nodemanager.log-dirs": "/hadoop/yarn/log" }, "property_attributes": { "yarn.nodemanager.container-executor.cgroups.mount": { @@ -3822,13 +3830,13 @@ class TestHDP22StackAdvisor(TestCase): "maximum": "49152" }, "yarn.scheduler.minimum-allocation-mb": { - "maximum": "39424" + "maximum": "43008" }, "yarn.nodemanager.resource.cpu-vcores": { "maximum": "12" }, "yarn.scheduler.maximum-allocation-mb": { - "maximum": "39424" + "maximum": "43008" }, "yarn.nodemanager.container-executor.resources-handler.class": { "delete": "true" http://git-wip-us.apache.org/repos/asf/ambari/blob/4278c4a4/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py index 39cbbce..4a77086 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py @@ -587,7 +587,8 @@ class TestHDP23StackAdvisor(TestCase): 'hive_exec_orc_storage_strategy': 'SPEED', 'hive_security_authorization': 'None', 'hive_timeline_logging_enabled': 'true', - 'hive_txn_acid': 'off' + 'hive_txn_acid': 'off', + 'hive.atlas.hook': 'false' } }, 'hive-site': { @@ -745,6 +746,7 @@ class TestHDP23StackAdvisor(TestCase): }, "hive-env": { "properties": { + "hive.atlas.hook": "false" } }, "hive-site": { @@ -863,7 +865,8 @@ class TestHDP23StackAdvisor(TestCase): 'hive_exec_orc_storage_strategy': 'SPEED', 'hive_security_authorization': 'None', 'hive_timeline_logging_enabled': 'true', - 'hive_txn_acid': 'off' + 'hive_txn_acid': 'off', + 'hive.atlas.hook': 'true' } }, 'hive-site': { @@ -1045,6 +1048,7 @@ class TestHDP23StackAdvisor(TestCase): }, "hive-env": { "properties": { + "hive.atlas.hook": "false" } }, "hive-site": { @@ -1462,6 +1466,31 @@ class TestHDP23StackAdvisor(TestCase): } ] }, + { + "href": "/api/v1/stacks/HDP/versions/2.3/services/KNOX", + "StackServices": { + "service_name": "KNOX", + "service_version": "0.9.0.2.3", + "stack_name": "HDP", + "stack_version": "2.3" + }, + "components": [ + { + "href": "/api/v1/stacks/HDP/versions/2.3/services/KNOX/components/KNOX_GATEWAY", + "StackServiceComponents": { + "advertise_version": "false", + "cardinality": "1+", + "component_category": "MASTER", + "component_name": "KNOX_GATEWAY", + "display_name": "Knox Gateway", + "is_client": "false", + "is_master": "true", + "hostnames": ["c6401.ambari.apache.org"] + }, + "dependencies": [] + } + ] + } ], "configurations": { "admin-properties": { @@ -1473,6 +1502,7 @@ class TestHDP23StackAdvisor(TestCase): "properties": { "ranger.service.http.port": "7777", "ranger.service.http.enabled": "true", + "ranger.sso.providerurl": "", } } }, @@ -1515,7 +1545,8 @@ class TestHDP23StackAdvisor(TestCase): 'ranger-admin-site': { 'properties': { "ranger.audit.solr.zookeepers": "NONE", - "ranger.audit.source.type": "solr" + "ranger.audit.source.type": "solr", + "ranger.sso.providerurl": "https://c6401.ambari.apache.org:8443/gateway/knoxsso/api/v1/websso" } }, 'ranger-env': { @@ -1733,6 +1764,11 @@ class TestHDP23StackAdvisor(TestCase): "properties": { "ranger-storm-plugin-enabled": "No" } + }, + "storm-env": { + "properties": { + "storm.atlas.hook": "true" + } } } services = { @@ -1773,6 +1809,11 @@ class TestHDP23StackAdvisor(TestCase): "properties": { "ranger-storm-plugin-enabled": "No" } + }, + "storm-env": { + "properties": { + "storm.atlas.hook": "false" + } } }, "changed-configurations": [ ] @@ -1830,6 +1871,11 @@ class TestHDP23StackAdvisor(TestCase): 'properties': { 'sqoop.job.data.publish.class': 'org.apache.atlas.sqoop.hook.SqoopHook', } + }, + 'sqoop-env': { + 'properties': { + 'sqoop.atlas.hook': 'true' + } } } services = { @@ -1864,6 +1910,11 @@ class TestHDP23StackAdvisor(TestCase): "properties": { "sqoop.job.data.publish.class": "foo" } + }, + "sqoop-env": { + "properties": { + "sqoop.atlas.hook": "false" + } } }, "changed-configurations": [ ] http://git-wip-us.apache.org/repos/asf/ambari/blob/4278c4a4/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py b/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py index 005283f..6af463c 100644 --- a/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py +++ b/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py @@ -95,7 +95,7 @@ class TestInfraSolr(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['infra-solr-log4j']['content']) ) - self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --create-znode --retry 5 --interval 10') + self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --create-znode --retry 30 --interval 5') self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --cluster-prop --property-name urlScheme --property-value http') self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --setup-kerberos-plugin') http://git-wip-us.apache.org/repos/asf/ambari/blob/4278c4a4/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py index 6b4fab8..df54cd8 100644 --- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py +++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py @@ -129,7 +129,7 @@ class TestLogSearch(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['logsearch-audit_logs-solrconfig']['content']) ) - self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --check-znode --retry 5 --interval 10') + self.assertResourceCalled('Execute', 'ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181 --znode /infra-solr --check-znode --retry 30 --interval 5') self.assertResourceCalledRegexp('^Execute$', '^ambari-sudo.sh JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /usr/lib/ambari-infra-solr-client/solrCloudCli.sh --zookeeper-connect-string c6401.ambari.apache.org:2181/infra-solr --download-config --config-dir /tmp/solr_config_hadoop_logs_0.[0-9]* --config-set hadoop_logs --retry 30 --interval 5') self.assertResourceCalledRegexp('^File$', '^/tmp/solr_config_hadoop_logs_0.[0-9]*', content=InlineTemplate(self.getConfig()['configurations']['logsearch-service_logs-solrconfig']['content']),