incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1487201 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/data/HDP2/config_mapping.js ambari-web/app/data/HDP2/config_properties.js ambari-web/app/models/service_config.js ambari-web/app/utils/config.js
Date Wed, 29 May 2013 02:06:36 GMT
Author: yusaku
Date: Wed May 29 02:06:36 2013
New Revision: 1487201

URL: http://svn.apache.org/r1487201
Log:
AMBARI-2211.YARN does not show any configurations. (yusaku)

Added:
    incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js
Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js
    incubator/ambari/trunk/ambari-web/app/models/service_config.js
    incubator/ambari/trunk/ambari-web/app/utils/config.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487201&r1=1487200&r2=1487201&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 29 02:06:36 2013
@@ -899,7 +899,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
- AMBARI-2210.  Hadoop 2 stack version check should be integer based instead of
+ AMBARI-2211. YARN does not show any configurations. (yusaku) 
+
+ AMBARI-2210. Hadoop 2 stack version check should be integer based instead of
  string. (yusaku)
 
  AMBARI-2208. Reassign Master Wizard: refreshing page on step 2, 3 or 4 breaks

Added: incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js?rev=1487201&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js (added)
+++ incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js Wed May 29 02:06:36
2013
@@ -0,0 +1,774 @@
+/**
+ * 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.
+ */
+
+var configs = [
+  /**********************************************core-site***************************************/
+  {
+    "name": "fs.default.name",
+    "templateName": ["namenode_host"],
+    "foreignKey": null,
+    "value": "hdfs://<templateName[0]>:8020",
+    "filename": "core-site.xml"
+  },
+  {
+    "name": "fs.checkpoint.dir",
+    "templateName": ["fs_checkpoint_dir"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml"
+  },
+  {
+    "name": "fs.checkpoint.period",
+    "templateName": ["fs_checkpoint_period"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml"
+  },
+  {
+    "name": "fs.checkpoint.size",
+    "templateName": ["fs_checkpoint_size"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml"
+  },
+  {
+    "name": "fs.checkpoint.edits.dir",
+    "templateName": ["fs_checkpoint_dir"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml"
+  },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
+    "templateName": ["proxyuser_group"],
+    "foreignKey": ["hive_user"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "isOverridable" : true
+  },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
+    "templateName": ["hivemetastore_host"],
+    "foreignKey": ["hive_user"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "isOverridable" : true
+  },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
+    "templateName": ["proxyuser_group"],
+    "foreignKey": ["oozie_user"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "isOverridable" : true
+  },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
+    "templateName": ["oozieserver_host"],
+    "foreignKey": ["oozie_user"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "isOverridable" : true
+  },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
+    "templateName": ["proxyuser_group"],
+    "foreignKey": ["webhcat_user"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "isOverridable" : true
+  },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
+    "templateName": ["hivemetastore_host"],
+    "foreignKey": ["webhcat_user"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "isOverridable" : true
+  },
+  /**********************************************hdfs-site***************************************/
+  {
+    "name": "dfs.name.dir",
+    "templateName": ["dfs_name_dir"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.webhdfs.enabled",
+    "templateName": ["dfs_webhdfs_enabled"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.datanode.failed.volumes.tolerated",
+    "templateName": ["dfs_datanode_failed_volume_tolerated"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.block.local-path-access.user",
+    "templateName": ["dfs_block_local_path_access_user"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.data.dir",
+    "templateName": ["dfs_data_dir"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.hosts.exclude",
+    "templateName": ["hadoop_conf_dir", "dfs_exclude"],
+    "foreignKey": null,
+    "value": "<templateName[0]>\/<templateName[1]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.hosts",
+    "templateName": ["hadoop_conf_dir", "dfs_include"],
+    "foreignKey": null,
+    "value": "<templateName[0]>\/<templateName[1]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.replication",
+    "templateName": ["dfs_replication"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.datanode.address",
+    "templateName": ["dfs_datanode_address"],
+    "foreignKey": null,
+    "value": "0.0.0.0:<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.datanode.http.address",
+    "templateName": ["dfs_datanode_http_address"],
+    "foreignKey": null,
+    "value": "0.0.0.0:<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.http.address",
+    "templateName": ["namenode_host"],
+    "foreignKey": null,
+    "value": "<templateName[0]>:50070",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.datanode.du.reserved",
+    "templateName": ["datanode_du_reserved"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.namenode.kerberos.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "nn\/_HOST@<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.secondary.namenode.kerberos.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "nn\/_HOST@<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.namenode.kerberos.https.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "host\/_HOST@<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.secondary.namenode.kerberos.https.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "host\/_HOST@<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.secondary.http.address",
+    "templateName": ["snamenode_host"],
+    "foreignKey": null,
+    "value": "<templateName[0]>:50090",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.web.authentication.kerberos.keytab",
+    "templateName": ["keytab_path"],
+    "foreignKey": null,
+    "value": "<templateName[0]>\/spnego.service.keytab",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.datanode.kerberos.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "dn\/_HOST@<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.namenode.keytab.file",
+    "templateName": ["keytab_path"],
+    "foreignKey": null,
+    "value": "<templateName[0]>\/nn.service.keytab",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.secondary.namenode.keytab.file",
+    "templateName": ["keytab_path"],
+    "foreignKey": null,
+    "value": "<templateName[0]>\/nn.service.keytab",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.datanode.keytab.file",
+    "templateName": ["keytab_path"],
+    "foreignKey": null,
+    "value": "<templateName[0]>\/dn.service.keytab",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.https.address",
+    "templateName": ["namenode_host"],
+    "foreignKey": null,
+    "value": "<templateName[0]>:50470",
+    "filename": "hdfs-site.xml"
+  },
+  {
+    "name": "dfs.datanode.data.dir.perm",
+    "templateName": ["dfs_datanode_data_dir_perm"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hdfs-site.xml"
+  },
+  /**********************************************oozie-site***************************************/
+  {
+    "name": "oozie.base.url",
+    "templateName": ["oozieserver_host"],
+    "foreignKey": null,
+    "value": "http://<templateName[0]>:11000/oozie",
+    "filename": "oozie-site.xml"
+  },
+  /**********************************************hive-site***************************************/
+  {
+    "name": "javax.jdo.option.ConnectionUserName",
+    "templateName": ["hive_metastore_user_name"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hive-site.xml"
+  },
+  {
+    "name": "javax.jdo.option.ConnectionPassword",
+    "templateName": ["hive_metastore_user_passwd"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hive-site.xml"
+  },
+
+  {
+    "name": "hive.metastore.uris",
+    "templateName": ["hivemetastore_host"],
+    "foreignKey": null,
+    "value": "thrift://<templateName[0]>:9083",
+    "filename": "hive-site.xml"
+  },
+/**********************************************yarn-site***************************************/
+  {
+    "name": "yarn.resourcemanager.resourcetracker.address",
+    "templateName": ["rm_host"],
+    "foreignKey": null,
+    "value": "hdfs://<templateName[0]>:8025",
+    "filename": "yarn-site.xml"
+  },
+  {
+    "name": "yarn.resourcemanager.scheduler.address",
+    "templateName": ["rm_host"],
+    "foreignKey": null,
+    "value": "hdfs://<templateName[0]>:8030",
+    "filename": "yarn-site.xml"
+  },
+  {
+    "name": "yarn.resourcemanager.addresss",
+    "templateName": ["rm_host"],
+    "foreignKey": null,
+    "value": "hdfs://<templateName[0]>:8050",
+    "filename": "yarn-site.xml"
+  },
+  {
+    "name": "yarn.resourcemanager.admin.address",
+    "templateName": ["rm_host"],
+    "foreignKey": null,
+    "value": "hdfs://<templateName[0]>:8041",
+    "filename": "yarn-site.xml"
+  },
+/**********************************************mapred-site***************************************/
+  {
+    "name": "mapreduce.jobhistory.webapp.address",
+    "templateName": ["hs_host"],
+    "foreignKey": null,
+    "value": "hdfs://<templateName[0]>:19888",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.jobhistory.address",
+    "templateName": ["hs_host"],
+    "foreignKey": null,
+    "value": "hdfs://<templateName[0]>:10020",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.map.memory.mb",
+    "templateName": ["mapred_job_map_mem_mb"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.reduce.memory.mb",
+    "templateName": ["mapred_job_red_mem_mb"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "io.sort.mb",
+    "templateName": ["io_sort_mb"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  /*{
+    "name": "mapred.cluster.reduce.memory.mb",
+    "templateName": ["mapred_cluster_red_mem_mb"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.cluster.max.map.memory.mb",
+    "templateName": ["mapred_cluster_max_map_mem_mb"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.cluster.max.reduce.memory.mb",
+    "templateName": ["mapred_cluster_max_red_mem_mb"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.hosts",
+    "templateName": ["hadoop_conf_dir", "mapred_hosts_include"],
+    "foreignKey": null,
+    "value": "<templateName[0]>/<templateName[1]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.hosts.exclude",
+    "templateName": ["hadoop_conf_dir", "mapred_hosts_exclude"],
+    "foreignKey": null,
+    "value": "<templateName[0]>/<templateName[1]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.healthChecker.script.path",
+    "templateName": ["mapred_jobstatus_dir"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.job.tracker.persist.jobstatus.dir",
+    "templateName": ["hadoop_conf_dir"],
+    "foreignKey": null,
+    "value": "<templateName[0]>/health_check",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.child.java.opts",
+    "templateName": ["mapred_child_java_opts_sz"],
+    "foreignKey": null,
+    "value": "-server -Xmx<templateName[0]>m -Djava.net.preferIPv4Stack=true",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.cluster.map.memory.mb",
+    "templateName": ["mapred_cluster_map_mem_mb"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "io.sort.spill.percent",
+    "templateName": ["io_sort_spill_percent"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.system.dir",
+    "templateName": ["mapred_system_dir"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.job.tracker",
+    "templateName": ["jobtracker_host"],
+    "foreignKey": null,
+    "value": "<templateName[0]>:50300",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.job.tracker.http.address",
+    "templateName": ["jobtracker_host"],
+    "foreignKey": null,
+    "value": "<templateName[0]>:50030",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.userlog.retain.hours",
+    "templateName": ["mapreduce_userlog_retainhours"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.jobtracker.maxtasks.per.job",
+    "templateName": ["maxtasks_per_job"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapred.task.tracker.task-controller",
+    "templateName": ["task_controller"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.jobtracker.kerberos.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "jt/_HOST@<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.tasktracker.kerberos.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "tt/_HOST@<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.jobtracker.keytab.file",
+    "templateName": ["keytab_path"],
+    "foreignKey": null,
+    "value": "<templateName[0]>/jt.service.keytab",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.tasktracker.keytab.file",
+    "templateName": ["keytab_path"],
+    "foreignKey": null,
+    "value": "<templateName[0]>/tt.service.keytab",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.history.server.embedded",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "false",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.history.server.http.address",
+    "templateName": ["jobtracker_host"],
+    "foreignKey": null,
+    "value": "<templateName[0]>:51111",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.jobhistory.kerberos.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "jt/_HOST@<templateName[0]>",
+    "filename": "mapred-site.xml"
+  },
+  {
+    "name": "mapreduce.jobhistory.keytab.file",
+    "templateName": ["keytab_path"],
+    "foreignKey": null,
+    "value": "<templateName[0]>/jt.service.keytab",
+    "filename": "mapred-site.xml"
+  },*/
+  /**********************************************hbase-site***************************************/
+  {
+    "name": "hbase.rootdir",
+    "templateName": ["namenode_host", "hbase_hdfs_root_dir"],
+    "foreignKey": null,
+    "value": "hdfs://<templateName[0]>:8020<templateName[1]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.tmp.dir",
+    "templateName": ["hbase_tmp_dir"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.regionserver.global.memstore.upperLimit",
+    "templateName": ["regionserver_memstore_upperlimit"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.hstore.blockingStoreFiles",
+    "templateName": ["hstore_blockingstorefiles"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.hstore.compactionThreshold",
+    "templateName": ["hstore_compactionthreshold"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hfile.block.cache.size",
+    "templateName": ["hfile_blockcache_size"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.hregion.max.filesize",
+    "templateName": ["hstorefile_maxsize"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.regionserver.handler.count",
+    "templateName": ["regionserver_handlers"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.hregion.majorcompaction",
+    "templateName": ["hregion_majorcompaction"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.regionserver.global.memstore.lowerLimit",
+    "templateName": ["regionserver_memstore_lowerlimit"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.hregion.memstore.block.multiplier",
+    "templateName": ["hregion_blockmultiplier"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.hregion.memstore.mslab.enabled",
+    "templateName": ["regionserver_memstore_lab"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.hregion.memstore.flush.size",
+    "templateName": ["hregion_memstoreflushsize"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.client.scanner.caching",
+    "templateName": ["client_scannercaching"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.client.scanner.caching",
+    "templateName": ["client_scannercaching"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.cluster.distributed",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "true",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.zookeeper.property.clientPort",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "2181",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "zookeeper.session.timeout",
+    "templateName": ["zookeeper_sessiontimeout"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.client.keyvalue.maxsize",
+    "templateName": ["hfile_max_keyvalue_size"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.master.keytab.file",
+    "templateName": ["keytab_path"],
+    "foreignKey": null,
+    "value": "<templateName[0]>/hm.service.keytab",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.master.kerberos.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "hm/_HOST@<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.regionserver.kerberos.principal",
+    "templateName": ["kerberos_domain"],
+    "foreignKey": null,
+    "value": "rs/_HOST@<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "dfs.support.append",
+    "templateName": ["hdfs_support_append"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "dfs.client.read.shortcircuit",
+    "templateName": ["hdfs_enable_shortcircuit_read"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.security.authentication",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "simple",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.rpc.engine",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "org.apache.hadoop.hbase.ipc.WritableRpcEngine",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.security.authorization",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "false",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "hbase.zookeeper.quorum",
+    "templateName": ["zookeeperserver_hosts"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "name": "zookeeper.znode.parent",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "/hbase-unsecure",
+    "filename": "hbase-site.xml"
+  },
+  /**********************************************webhcat-site***************************************/
+  {
+    "name": "templeton.hive.properties",
+    "templateName": ["hivemetastore_host"],
+    "foreignKey": null,
+    "value": "hive.metastore.local=false,hive.metastore.uris=thrift://<templateName[0]>:9083,hive.metastore.sasl.enabled=yes,hive.metastore.execute.setugi=true",
+    "filename": "webhcat-site.xml"
+  },
+  {
+    "name": "templeton.zookeeper.hosts",
+    "templateName": ["zookeeperserver_hosts"],
+    "foreignKey": null,
+    "value": "<templateName[0]>",
+    "filename": "webhcat-site.xml"
+  }
+];
+
+/**
+ * Configs consists of 2 types: Computed values, which cannot be modified by user
+ * and overridable values, which user can modify. We provide interface how to get all of
this
+ * configs separately
+ * @type {Object}
+ */
+module.exports = {
+  all : function(){
+    return configs.slice(0);
+  },
+  overridable: function(){
+    return configs.filterProperty('foreignKey');
+  },
+  computed: function(){
+    return configs.filterProperty('foreignKey', null);
+  }
+};

Modified: incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js?rev=1487201&r1=1487200&r2=1487201&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js Wed May 29 02:06:36
2013
@@ -482,158 +482,47 @@ module.exports =
   /**********************************************MAPREDUCE2***************************************/
     {
       "id": "puppet var",
-      "name": "mapreduce_framework_name",
-      "displayName": "mapreduce.framework.name",
-      "description": "Execution framework set to Hadoop YARN.",
-      "defaultValue": "yarn",
-      "isVisible": true,
-      "isOverridable": false,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2"
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_map_memory_mb",
-      "displayName": "mapreduce.map.memory.mb",
-      "description": "Larger resource limit for maps.",
-      "defaultValue": "1536",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2"
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_map_java_opts",
-      "displayName": "mapreduce.map.java.opts",
-      "description": "Larger heap-size for child jvms of maps.",
-      "defaultValue": "-Xmx1024M",
-      "isVisible": true,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2"
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_reduce_memory_mb",
-      "displayName": "mapreduce.reduce.memory.mb",
-      "description": "Larger resource limit for reduces.",
-      "defaultValue": "3072",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2"
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_reduce_java_opts",
-      "displayName": "mapreduce.reduce.java.opts",
-      "description": "Larger heap-size for child jvms of reduces.",
-      "defaultValue": "-Xmx2560M",
-      "isVisible": true,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2"
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_task_io_sort_mb",
-      "displayName": "mapreduce.task.io.sort.mb",
-      "description": "Higher memory-limit while sorting data for efficiency.",
-      "defaultValue": "512",
-      "displayType": "int",
-      "unit": "MB",
-      "isVisible": true,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2"
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_task_io_sort_factor",
-      "displayName": "mapreduce.task.io.sort.factor",
-      "description": "More streams merged at once while sorting files.",
-      "defaultValue": "100",
-      "isVisible": true,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2"
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce_reduce_shuffle_parallelcopies",
-      "displayName": "mapreduce.reduce.shuffle.parallelcopies",
-      "description": "Higher number of parallel copies run by reduces to fetch outputs from
very large number of maps.",
-      "defaultValue": "50",
-      "isVisible": true,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2"
-    },
-    /*{
-      "id": "puppet var",
-      "name": "mapreduce.jobhistory.address",
-      "displayName": "JobHistory Server",
-      "defaultValue": "",
-      "description": "Default port is 10020.",
-      "displayType": "masterHosts",
-      "isOverridable": false,
-      "isVisible": false,
-      "serviceName": "MAPREDUCE2",
-      "category": "HistoryServer"
-    },
-    {
-      "id": "puppet var",
-      "name": "mapreduce.jobhistory.webapp.address",
-      "displayName": "JobHistory Server Web UI",
+      "name": "hs_host",
+      "displayName": "History Server",
+      "description": "History Server",
       "defaultValue": "",
-      "description": "Default port is 19888.",
-      "isOverridable": false,
-      "isVisible": false,
-      "serviceName": "MAPREDUCE2",
-      "category": "HistoryServer"
-    },*/
-    {
-      "id": "puppet var",
-      "name": "historyserver_host",
-      "displayName": "JobHistory Server",
-      "value": "",
-      "description": "The host that has been assigned to run History Server",
-      "displayType": "masterHosts",
       "isOverridable": false,
+      "displayType": "masterHost",
       "isVisible": true,
       "domain": "global",
-      "filename": "mapred-site.xml",
       "serviceName": "MAPREDUCE2",
       "category": "HistoryServer",
       "index": 0
     },
+  /**********************************************YARN***************************************/
     {
       "id": "puppet var",
-      "name": "mapreduce_jobhistory_intermediate-done-dir",
-      "displayName": "mapreduce.jobhistory.intermediate-done-dir",
-      "defaultValue": "/mr-history/tmp",
-      "description": "Directory where history files are written by MapReduce jobs.",
-      "displayType": "directory",
+      "name": "rm_host",
+      "displayName": "Resource Manager",
+      "description": "Resource Manager",
+      "defaultValue": "",
       "isOverridable": false,
+      "displayType": "masterHost",
       "isVisible": true,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2",
-      "category": "HistoryServer",
-      "index": 1
+      "domain": "global",
+      "serviceName": "YARN",
+      "category": "ResourceManager",
+      "index": 0
     },
     {
       "id": "puppet var",
-      "name": "mapreduce_jobhistory_done-dir",
-      "displayName": "mapreduce.jobhistory.done-dir",
-      "defaultValue": "/mr-history/done",
-      "description": "Directory where history files are managed by the MR JobHistory Server.",
-      "displayType": "directory",
+      "name": "nm_hosts",
+      "displayName": "Node Manager",
+      "description": "List of Node Manager Hosts.",
+      "defaultValue": "",
       "isOverridable": false,
+      "displayType": "slaveHosts",
       "isVisible": true,
-      "filename": "mapred-site.xml",
-      "serviceName": "MAPREDUCE2",
-      "category": "HistoryServer",
-      "index": 2
+      "domain": "global",
+      "serviceName": "YARN",
+      "category": "NodeManager",
+      "index": 0
     },
-
   /**********************************************HBASE***************************************/
     {
       "id": "puppet var",

Modified: incubator/ambari/trunk/ambari-web/app/models/service_config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/service_config.js?rev=1487201&r1=1487200&r2=1487201&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/service_config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/service_config.js Wed May 29 02:06:36 2013
@@ -244,13 +244,13 @@ App.ServiceConfigProperty = Ember.Object
       case 'datanode_hosts':
         this.set('value', slaveComponentHostsInDB.findProperty('componentName', 'DATANODE').hosts.mapProperty('hostName'));
         break;
-      case 'historyserver_host':
+      case 'hs_host':
         this.set('value', masterComponentHostsInDB.filterProperty('component', 'HISTORYSERVER').mapProperty('hostName'));
         break;
-      case 'resourcemanager_host':
+      case 'rm_host':
         this.set('value', masterComponentHostsInDB.findProperty('component', 'RESOURCEMANAGER').hostName);
         break;
-      case 'nodemanager_hosts':
+      case 'nm_hosts':
         this.set('value', slaveComponentHostsInDB.findProperty('componentName', 'NODEMANAGER').hosts.mapProperty('hostName'));
         break;
       case 'jobtracker_host':

Modified: incubator/ambari/trunk/ambari-web/app/utils/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/config.js?rev=1487201&r1=1487200&r2=1487201&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/config.js Wed May 29 02:06:36 2013
@@ -25,8 +25,22 @@ var globalPropertyToServicesMap = null;
 
 App.config = Em.Object.create({
 
-  preDefinedServiceConfigs: require('data/service_configs'),
-  configMapping: require('data/config_mapping'),
+  preDefinedServiceConfigs: function(){
+    var configs = this.get('preDefinedConfigProperties');
+    var services = [];
+    require('data/service_configs').forEach(function(service){
+      service.configs = configs.filterProperty('serviceName', service.serviceName);
+      services.push(service);
+    });
+    return services;
+  }.property('preDefinedConfigProperties'),
+  configMapping: function() {
+      if (stringUtils.compareVersions(App.get('currentStackVersionNumber'), "2.0") === 1
||
+        stringUtils.compareVersions(App.get('currentStackVersionNumber'), "2.0") === 0) {
+        return require('data/config_mapping');
+      }
+      return require('data/HDP2/config_mapping');
+  }.property('App.currentStackVersionNumber'),
   preDefinedConfigProperties: function() {
     if (stringUtils.compareVersions(App.get('currentStackVersionNumber'), "2.0") === 1 ||
       stringUtils.compareVersions(App.get('currentStackVersionNumber'), "2.0") === 0) {
@@ -429,7 +443,7 @@ App.config = Em.Object.create({
    * @param serviceName
    */
   createServiceConfig: function (serviceName) {
-    var preDefinedServiceConfig = App.config.preDefinedServiceConfigs.findProperty('serviceName',
serviceName);
+    var preDefinedServiceConfig = App.config.get('preDefinedServiceConfigs').findProperty('serviceName',
serviceName);
     var serviceConfig = App.ServiceConfig.create({
       filename: preDefinedServiceConfig.filename,
       serviceName: preDefinedServiceConfig.serviceName,



Mime
View raw message