ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-4641. Some Tez properties do not have default values populated. (jaimin)
Date Wed, 12 Feb 2014 23:03:45 GMT
Updated Branches:
  refs/heads/trunk 2213e103b -> f64fed6a1


AMBARI-4641. Some Tez properties do not have default values populated. (jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f64fed6a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f64fed6a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f64fed6a

Branch: refs/heads/trunk
Commit: f64fed6a1ee77c13f8ab4539bdc6d5826d9f4028
Parents: 2213e10
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Wed Feb 12 15:03:25 2014 -0800
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Wed Feb 12 15:03:25 2014 -0800

----------------------------------------------------------------------
 ambari-web/app/data/HDP2/site_properties.js | 374 ++---------------------
 ambari-web/app/data/service_configs.js      |   4 +-
 2 files changed, 33 insertions(+), 345 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f64fed6a/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 6eef06d..3a97c6a 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1403,320 +1403,6 @@ module.exports =
       "displayType": "string",
       "filename": "storm-site.xml"
     },
-
-  /**********************************************tez-site***************************************/
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.lib.uris",
-      "name": "tez.lib.uris",
-      "defaultValue": "file:///usr/lib/tez/,file:///usr/lib/tez/lib/",
-      "displayType": "string"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.log.level",
-      "name": "tez.am.log.level",
-      "defaultValue": "INFO",
-      "displayType": "string"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.staging-dir",
-      "name": "tez.staging-dir",
-      "defaultValue": "/tmp/${user.name}/staging",
-      "displayType": "directory"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.slowstart-vertex-scheduler.min-src-fraction",
-      "name": "tez.slowstart-vertex-scheduler.min-src-fraction",
-      "defaultValue": "0.1",
-      "displayType": "string"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.slowstart-vertex-scheduler.max-src-fraction",
-      "name": "tez.slowstart-vertex-scheduler.max-src-fraction",
-      "defaultValue": "0.1",
-      "displayType": "string"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.am-rm.heartbeat.interval-ms.max",
-      "name": "tez.am.am-rm.heartbeat.interval-ms.max",
-      "defaultValue": "250",
-      "displayType": "int"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.runtime.broadcast.data-via-events.enabled",
-      "name": "tez.runtime.broadcast.data-via-events.enabled",
-      "defaultValue": "true",
-      "displayType": "checkbox"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.runtime.broadcast.data-via-events.max-size",
-      "name": "tez.runtime.broadcast.data-via-events.max-size",
-      "defaultValue": "614400",
-      "displayType": "int"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.aggressive.scheduling",
-      "name": "tez.am.aggressive.scheduling",
-      "defaultValue": "false",
-      "displayType": "checkbox"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.resource.memory.mb",
-      "name": "tez.am.resource.memory.mb",
-      "defaultValue": "1024",
-      "displayType": "int"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.java.opts",
-      "name": "tez.am.java.opts",
-      "defaultValue": "-server -Xmx1024m -Djava.net.preferIPv4Stack=true -XX:+PrintGCDetails
-verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC",
-      "displayType": "string"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.grouping.split-waves",
-      "name": "tez.am.grouping.split-waves",
-      "defaultValue": "1.7",
-      "displayType": "string"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.container.reuse.enabled",
-      "name": "tez.am.container.reuse.enabled",
-      "defaultValue": "true",
-      "displayType": "checkbox"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.container.reuse.rack-fallback.enabled",
-      "name": "tez.am.container.reuse.rack-fallback.enabled",
-      "defaultValue": "true",
-      "displayType": "checkbox"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.container.reuse.non-local-fallback.enabled",
-      "name": "tez.am.container.reuse.non-local-fallback.enabled",
-      "defaultValue": "true",
-      "displayType": "checkbox"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.container.session.delay-allocation-millis",
-      "name": "tez.am.container.session.delay-allocation-millis",
-      "defaultValue": "300000",
-      "displayType": "int"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.am.container.reuse.locality.delay-allocation-millis",
-      "name": "tez.am.container.reuse.locality.delay-allocation-millis",
-      "defaultValue": "250",
-      "displayType": "int"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.runtime.intermediate-output.should-compress",
-      "name": "tez.runtime.intermediate-output.should-compress",
-      "defaultValue": "true",
-      "displayType": "checkbox"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.runtime.intermediate-output.compress.codec",
-      "name": "tez.runtime.intermediate-output.compress.codec",
-      "defaultValue": "org.apache.hadoop.io.compress.DefaultCodec",
-      "displayType": "string"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.runtime.intermdiate-input.is-compressed",
-      "name": "tez.runtime.intermdiate-input.is-compressed",
-      "defaultValue": "true",
-      "displayType": "checkbox"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.runtime.intermediate-input.compress.codec",
-      "name": "tez.runtime.intermediate-input.compress.codec",
-      "defaultValue": "org.apache.hadoop.io.compress.DefaultCodec",
-      "displayType": "string"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.task.get-task.sleep.interval-ms.max",
-      "name": "tez.task.get-task.sleep.interval-ms.max",
-      "defaultValue": "100",
-      "displayType": "int"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.runtime.job.counters.max",
-      "name": "tez.runtime.job.counters.max",
-      "defaultValue": "5000",
-      "displayType": "int"
-    },
-    {
-      "id": "site property",
-      "description": "",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "isRequiredByAgent": true,
-      "serviceName": "TEZ",
-      "category": "General",
-      "displayName": "tez.runtime.job.counters.groups.max",
-      "name": "tez.runtime.job.counters.groups.max",
-      "defaultValue": "5000",
-      "displayType": "int"
-    },
   /*********************************************oozie-site for Falcon*****************************/
     {
       "id":"site property",
@@ -1725,7 +1411,7 @@ module.exports =
       "isVisible":true,
       "isRequiredByAgent": true,
       "serviceName":"FALCON",
-      "category":"Advanced",
+      "category":"Falcon - Oozie integration",
       "displayName":"Falcon proxyuser hosts",
       "name":"oozie.service.ProxyUserService.proxyuser.falcon.hosts",
       "defaultValue":"*",
@@ -1738,7 +1424,7 @@ module.exports =
       "isVisible":true,
       "isRequiredByAgent": true,
       "serviceName":"FALCON",
-      "category":"Advanced",
+      "category":"Falcon - Oozie integration",
       "displayName":"Falcon proxyuser groups",
       "name":"oozie.service.ProxyUserService.proxyuser.falcon.groups",
       "defaultValue":"*",
@@ -1748,11 +1434,11 @@ module.exports =
       "id":"site property",
       "description":"",
       "isReconfigurable":false,
-      "isVisible":false,
+      "isVisible":true,
       "isRequiredByAgent": true,
       "serviceName":"FALCON",
-      "category":"Advanced",
-      "displayName":"Falcon",
+      "category":"Falcon - Oozie integration",
+      "displayName":"oozie.service.ELService.ext.functions.coord-job-submit-instances",
       "name":"oozie.service.ELService.ext.functions.coord-job-submit-instances",
       "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,"
         + "today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,"
@@ -1764,17 +1450,17 @@ module.exports =
         + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,"
         + "latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,"
         + "future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo",
-      "displayType":"multiLine"
+      "displayType":"custom"
     },
     {
       "id":"site property",
       "description":"",
       "isReconfigurable":false,
-      "isVisible":false,
+      "isVisible":true,
       "isRequiredByAgent": true,
       "serviceName":"FALCON",
-      "category":"Advanced",
-      "displayName":"Falcon",
+      "category":"Falcon - Oozie integration",
+      "displayName":"oozie.service.ELService.ext.functions.coord-action-create-inst",
       "name":"oozie.service.ELService.ext.functions.coord-action-create-inst",
       "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst,"
         + "today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst,"
@@ -1787,17 +1473,17 @@ module.exports =
         + "future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,"
         + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,"
         + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"multiLine"
+      "displayType":"custom"
     },
     {
       "id":"site property",
       "description":"",
       "isReconfigurable":false,
-      "isVisible":false,
+      "isVisible":true,
       "isRequiredByAgent": true,
       "serviceName":"FALCON",
-      "category":"Advanced",
-      "displayName":"Falcon",
+      "category":"Falcon - Oozie integration",
+      "displayName":"oozie.service.ELService.ext.functions.coord-action-create",
       "name": "oozie.service.ELService.ext.functions.coord-action-create",
       "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,"
         + "today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,"
@@ -1810,17 +1496,17 @@ module.exports =
         + "future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,"
         + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,"
         + "user=org.apache.oozie.coord.CoordELFunctions#coord_user,",
-      "displayType":"multiLine"
+      "displayType":"custom"
     },
     {
       "id":"site property",
       "description":"",
       "isReconfigurable":false,
-      "isVisible":false,
+      "isVisible":true,
       "isRequiredByAgent": true,
       "serviceName":"FALCON",
-      "category":"Advanced",
-      "displayName":"Falcon",
+      "category":"Falcon - Oozie integration",
+      "displayName":"oozie.service.ELService.ext.functions.coord-job-submit-data",
       "name":"oozie.service.ELService.ext.functions.coord-job-submit-data",
       "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,"
         + "today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,"
@@ -1834,17 +1520,17 @@ module.exports =
         + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,"
         + "dateOffset=org.apache.oozie.coord.CoordELFunctions#ph1_coord_dateOffset_echo,"
         + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"multiLine"
+      "displayType":"custom"
     },
     {
       "id":"site property",
       "description":"",
       "isReconfigurable":false,
-      "isVisible":false,
+      "isVisible":true,
       "isRequiredByAgent": true,
       "serviceName":"FALCON",
-      "category":"Advanced",
-      "displayName":"Falcon",
+      "category":"Falcon - Oozie integration",
+      "displayName":"oozie.service.ELService.ext.functions.coord-action-start",
       "name":"oozie.service.ELService.ext.functions.coord-action-start",
       "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,"
         + "today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,"
@@ -1860,35 +1546,35 @@ module.exports =
         + "dateOffset=org.apache.oozie.coord.CoordELFunctions#ph3_coord_dateOffset,"
         + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_formatTime,"
         + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"multiLine"
+      "displayType":"custom"
     },
     {
       "id":"site property",
       "description":"",
       "isReconfigurable":false,
-      "isVisible":false,
+      "isVisible":true,
       "isRequiredByAgent": true,
       "serviceName":"FALCON",
-      "category":"Advanced",
-      "displayName":"Falcon",
+      "category":"Falcon - Oozie integration",
+      "displayName":"oozie.service.ELService.ext.functions.coord-sla-submit",
       "name":"oozie.service.ELService.ext.functions.coord-sla-submit",
       "defaultValue":"instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_fixed,"
         + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"multiLine"
+      "displayType":"custom"
     },
     {
       "id":"site property",
       "description":"",
       "isReconfigurable":false,
-      "isVisible":false,
+      "isVisible":true,
       "isRequiredByAgent": true,
       "serviceName":"FALCON",
-      "category":"Advanced",
-      "displayName":"Falcon",
+      "category":"Falcon - Oozie integration",
+      "displayName":"oozie.service.ELService.ext.functions.coord-sla-create",
       "name":"oozie.service.ELService.ext.functions.coord-sla-create",
       "defaultValue":"instanceTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_nominalTime,"
         + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
-      "displayType":"multiLine"
+      "displayType":"custom"
     },
   /**********************************************webhcat-site***************************************/
     {

http://git-wip-us.apache.org/repos/asf/ambari/blob/f64fed6a/ambari-web/app/data/service_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js
index 4146216..d68ce21 100644
--- a/ambari-web/app/data/service_configs.js
+++ b/ambari-web/app/data/service_configs.js
@@ -225,7 +225,8 @@ module.exports = [
     displayName: 'Falcon',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'Falcon', displayName : 'Falcon Server'}),
-      App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Falcon - Oozie
integration'})
+      App.ServiceConfigCategory.create({ name: 'Falcon - Oozie integration', displayName
: 'Falcon - Oozie integration'}),
+      App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'})
     ],
     sites: ['global', 'oozie-site'],
     configs: []
@@ -256,6 +257,7 @@ module.exports = [
     filename: 'tez-site',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
+      App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
       App.ServiceConfigCategory.create({ name: 'AdvancedTezSite', displayName : 'Custom tez-site.xml',
siteFileName: 'tez-site.xml', canAddProperty: true})
     ],
     sites: ['global', 'tez-site'],


Mime
View raw message