Added: incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/WEBHCAT/configuration/webhcat-site.xml URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/WEBHCAT/configuration/webhcat-site.xml?rev=1464234&view=auto ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/WEBHCAT/configuration/webhcat-site.xml (added) +++ incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/WEBHCAT/configuration/webhcat-site.xml Wed Apr 3 23:25:31 2013 @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> + +<!-- The default settings for Templeton. --> +<!-- Edit templeton-site.xml to change settings for your local --> +<!-- install. --> + +<configuration> + + <property> + <name>templeton.port</name> + <value>50111</value> + <description>The HTTP port for the main server.</description> + </property> + + <property> + <name>templeton.hadoop.conf.dir</name> + <value>/etc/hadoop/conf</value> + <description>The path to the Hadoop configuration.</description> + </property> + + <property> + <name>templeton.jar</name> + <value>/usr/lib/hcatalog/share/webhcat/svr/webhcat.jar</value> + <description>The path to the Templeton jar file.</description> + </property> + + <property> + <name>templeton.libjars</name> + <value>/usr/lib/zookeeper/zookeeper.jar</value> + <description>Jars to add the the classpath.</description> + </property> + + + <property> + <name>templeton.hadoop</name> + <value>/usr/bin/hadoop</value> + <description>The path to the Hadoop executable.</description> + </property> + + <property> + <name>templeton.pig.archive</name> + <value>hdfs:///apps/webhcat/pig.tar.gz</value> + <description>The path to the Pig archive.</description> + </property> + + <property> + <name>templeton.pig.path</name> + <value>pig.tar.gz/pig/bin/pig</value> + <description>The path to the Pig executable.</description> + </property> + + <property> + <name>templeton.hcat</name> + <value>/usr/bin/hcat</value> + <description>The path to the hcatalog executable.</description> + </property> + + <property> + <name>templeton.hive.archive</name> + <value>hdfs:///apps/webhcat/hive.tar.gz</value> + <description>The path to the Hive archive.</description> + </property> + + <property> + <name>templeton.hive.path</name> + <value>hive.tar.gz/hive/bin/hive</value> + <description>The path to the Hive executable.</description> + </property> + + <property> + <name>templeton.hive.properties</name> + <value></value> + <description>Properties to set when running hive.</description> + </property> + + + <property> + <name>templeton.zookeeper.hosts</name> + <value></value> + <description>ZooKeeper servers, as comma separated host:port pairs</description> + </property> + + <property> + <name>templeton.storage.class</name> + <value>org.apache.hcatalog.templeton.tool.ZooKeeperStorage</value> + <description>The class to use as storage</description> + </property> + + <property> + <name>templeton.override.enabled</name> + <value>false</value> + <description> + Enable the override path in templeton.override.jars + </description> + </property> + + <property> + <name>templeton.streaming.jar</name> + <value>hdfs:///apps/webhcat/hadoop-streaming.jar</value> + <description>The hdfs path to the Hadoop streaming jar file.</description> + </property> + + <property> + <name>templeton.exec.timeout</name> + <value>60000</value> + <description>Time out for templeton api</description> + </property> + +</configuration>
Added: incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/WEBHCAT/metainfo.xml URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/WEBHCAT/metainfo.xml?rev=1464234&view=auto ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/WEBHCAT/metainfo.xml (added) +++ incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/WEBHCAT/metainfo.xml Wed Apr 3 23:25:31 2013 @@ -0,0 +1,31 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<metainfo> + <user>root</user> + <comment>This is comment for WEBHCAT service</comment> + <version>0.5.0</version> + + <components> + <component> + <name>WEBHCAT_SERVER</name> + <category>MASTER</category> + </component> + </components> + + +</metainfo> Added: incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml?rev=1464234&view=auto ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml (added) +++ incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml Wed Apr 3 23:25:31 2013 @@ -0,0 +1,35 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<metainfo> + <user>root</user> + <comment>This is comment for ZOOKEEPER service</comment> + <version>3.4.5</version> + + <components> + <component> + <name>ZOOKEEPER_SERVER</name> + <category>MASTER</category> + </component> + + <component> + <name>ZOOKEEPER_CLIENT</name> + <category>CLIENT</category> + </component> + </components> + +</metainfo> Modified: incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java?rev=1464234&r1=1464233&r2=1464234&view=diff ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java (original) +++ incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java Wed Apr 3 23:25:31 2013 @@ -143,6 +143,14 @@ public class JMXPropertyProviderTest { properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs")); properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes")); properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs")); + properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "maps_running")); + properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduces_running")); + properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "mapTaskSlots")); + properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduceTaskSlots")); + properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "failedDirs")); + properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_completed")); + properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_timeout")); + properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_ping")); request = PropertyHelper.getReadRequest(properties); @@ -150,7 +158,7 @@ public class JMXPropertyProviderTest { Assert.assertEquals(propertyProvider.getSpec("domu-12-31-39-14-ee-b3.compute-1.internal", "50060"), streamProvider.getLastSpec()); - Assert.assertEquals(10, PropertyHelper.getProperties(resource).size()); + Assert.assertEquals(18, PropertyHelper.getProperties(resource).size()); Assert.assertEquals(954466304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax"))); Assert.assertEquals(18330984, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed"))); Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax"))); @@ -159,6 +167,15 @@ public class JMXPropertyProviderTest { Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs"))); Assert.assertEquals(1841, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes"))); Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs"))); + Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "maps_running"))); + Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduces_running"))); + Assert.assertEquals(4, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "mapTaskSlots"))); + Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduceTaskSlots"))); + Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "failedDirs"))); + Assert.assertEquals(4, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_completed"))); + Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_timeout"))); + Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_ping"))); + Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount"))); Modified: incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/CategoryPredicateTest.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/CategoryPredicateTest.java?rev=1464234&r1=1464233&r2=1464234&view=diff ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/CategoryPredicateTest.java (original) +++ incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/CategoryPredicateTest.java Wed Apr 3 23:25:31 2013 @@ -1,20 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.apache.ambari.server.controller.predicate; import junit.framework.Assert; Modified: incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/mapreduce_tasktracker_jmx.json URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/mapreduce_tasktracker_jmx.json?rev=1464234&r1=1464233&r2=1464234&view=diff ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/mapreduce_tasktracker_jmx.json (original) +++ incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/mapreduce_tasktracker_jmx.json Wed Apr 3 23:25:31 2013 @@ -508,14 +508,14 @@ "tag.context" : "mapred", "tag.sessionId" : "", "tag.hostName" : "ip-10-85-111-149.ec2.internal", - "maps_running" : 0, - "reduces_running" : 0, + "maps_running" : 1, + "reduces_running" : 1, "mapTaskSlots" : 4, "reduceTaskSlots" : 2, - "failedDirs" : 0, + "failedDirs" : 1, "tasks_completed" : 4, - "tasks_failed_timeout" : 0, - "tasks_failed_ping" : 0 + "tasks_failed_timeout" : 1, + "tasks_failed_ping" : 1 }, { "name" : "Hadoop:service=TaskTracker,name=MetricsSystem,sub=Stats", "modelerType" : "MetricsSystem,sub=Stats", Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/initialize.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/initialize.js?rev=1464234&r1=1464233&r2=1464234&view=diff ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-web/app/initialize.js (original) +++ incubator/ambari/branches/branch-1.2/ambari-web/app/initialize.js Wed Apr 3 23:25:31 2013 @@ -23,8 +23,8 @@ App.testMode = false; App.skipBootstrap = false; App.alwaysGoToInstaller = false; App.apiPrefix = '/api/v1'; -App.defaultStackVersion = 'HDP-1.2.0'; -App.defaultLocalStackVersion = 'HDPLocal-1.2.0'; +App.defaultStackVersion = 'HDP-1.2.1'; +App.defaultLocalStackVersion = 'HDPLocal-1.2.1'; App.defaultJavaHome = '/usr/jdk/jdk1.6.0_31'; App.addServicesEnabled = false; // default AJAX timeout
