Updated Branches: refs/heads/trunk bf71649ca -> 8e73a2697
AMBARI-2760. Stack 2.0.3, Hive Check execute fail. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/8e73a269 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/8e73a269 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/8e73a269 Branch: refs/heads/trunk Commit: 8e73a2697b7cfbd3a60f6af1a1969ce09aa74b21 Parents: bf71649 Author: Srimanth Gunturi <[email protected]> Authored: Mon Jul 29 10:25:10 2013 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Mon Jul 29 10:25:23 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/data/HDP2/config_mapping.js | 57 +++++++++++++++++++++- ambari-web/app/data/HDP2/config_properties.js | 42 ++++++++++++++-- 2 files changed, 95 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8e73a269/ambari-web/app/data/HDP2/config_mapping.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/config_mapping.js b/ambari-web/app/data/HDP2/config_mapping.js index 56f0e2d..39006ae 100644 --- a/ambari-web/app/data/HDP2/config_mapping.js +++ b/ambari-web/app/data/HDP2/config_mapping.js @@ -216,8 +216,57 @@ var configs = [ "value": "http://<templateName[0]>:11000/oozie", "filename": "oozie-site.xml" }, + { + "name": "oozie.service.JPAService.create.db.schema", + "templateName": [], + "foreignKey": null, + "value": "false", // this is always false + "filename": "oozie-site.xml" + }, + { + "name": "oozie.db.schema.name", + "templateName": ['oozie_database_name'], + "foreignKey": null, + "value": "<templateName[0]>", + "filename": "oozie-site.xml" + }, + { + "name": "oozie.service.JPAService.jdbc.driver", + "templateName": [], + "foreignKey": null, + "value": "org.apache.derby.jdbc.EmbeddedDriver", // this value is overwritten in code + "filename": "oozie-site.xml" + }, + { + "name": "oozie.service.JPAService.jdbc.username", + "templateName": ['oozie_metastore_user_name'], + "foreignKey": null, + "value": "<templateName[0]>", + "filename": "oozie-site.xml" + }, + { + "name": "oozie.service.JPAService.jdbc.password", + "templateName": ['oozie_metastore_user_passwd'], + "foreignKey": null, + "value": "<templateName[0]>", + "filename": "oozie-site.xml" + }, + { + "name": "oozie.service.JPAService.jdbc.url", + "templateName": ["oozie_jdbc_connection_url"], + "foreignKey": null, + "value": "<templateName[0]>", + "filename": "oozie-site.xml" + }, /**********************************************hive-site***************************************/ { + "name": "javax.jdo.option.ConnectionDriverName", + "templateName": [], + "foreignKey": null, + "value": "com.mysql.jdbc.Driver", // this value is overwritten in code + "filename": "hive-site.xml" + }, + { "name": "javax.jdo.option.ConnectionUserName", "templateName": ["hive_metastore_user_name"], "foreignKey": null, @@ -231,7 +280,13 @@ var configs = [ "value": "<templateName[0]>", "filename": "hive-site.xml" }, - + { + "name": "javax.jdo.option.ConnectionURL", + "templateName": ["hive_jdbc_connection_url"], + "foreignKey": null, + "value": "<templateName[0]>", + "filename": "hive-site.xml" + }, { "name": "hive.metastore.uris", "templateName": ["hivemetastore_host"], http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8e73a269/ambari-web/app/data/HDP2/config_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/config_properties.js b/ambari-web/app/data/HDP2/config_properties.js index 4d3a62a..ab8f392 100644 --- a/ambari-web/app/data/HDP2/config_properties.js +++ b/ambari-web/app/data/HDP2/config_properties.js @@ -1072,6 +1072,7 @@ module.exports = "displayType": "masterHost", "isOverridable": false, "isVisible": true, + "isObserved": true, "serviceName": "HIVE", "category": "Hive Metastore", "index": 0 @@ -1184,6 +1185,7 @@ module.exports = "displayType": "host", "isOverridable": false, "isVisible": false, + "isObserved": true, "domain": "global", "serviceName": "HIVE", "category": "Hive Metastore", @@ -1199,6 +1201,7 @@ module.exports = "displayType": "host", "isOverridable": false, "isVisible": false, + "isObserved": true, "domain": "global", "serviceName": "HIVE", "category": "Hive Metastore", @@ -1230,6 +1233,7 @@ module.exports = "displayType": "host", "isOverridable": false, "isVisible": true, + "isObserved": true, "domain": "global", "serviceName": "HIVE", "category": "Hive Metastore", @@ -1267,6 +1271,20 @@ module.exports = }, { "id": "puppet var", + "name": "hive_jdbc_connection_url", + "displayName": "Database URL", + "value": "", + "defaultValue": " ", // set to a space to not include this in initial error count + "description": "The JDBC connection URL to the database", + "displayType": "advanced", + "isOverridable": false, + "isVisible": true, + "serviceName": "HIVE", + "category": "Hive Metastore", + "index": 7 + }, + { + "id": "puppet var", "name": "hive_metastore_port", "displayName": "Hive metastore port", "description": "", @@ -1441,6 +1459,7 @@ module.exports = "description": "Using an existing Oracle database for Oozie Metastore", "displayType": "masterHost", "isVisible": false, + "isObserved": true, "isReconfigurable": false, "isOverridable": false, //"domain": "global", @@ -1509,11 +1528,11 @@ module.exports = displayName: 'New Derby Database', foreignKeys: ['oozie_derby_database'] }, - { + /*{ displayName: 'New MySQL Database', foreignKeys: ['oozie_ambari_database', 'oozie_ambari_host'], hidden: !App.supports.hiveOozieExtraDatabases - }, + },*/ { displayName: 'Existing MySQL Database', foreignKeys: ['oozie_existing_mysql_database', 'oozie_existing_mysql_host'], @@ -1546,6 +1565,7 @@ module.exports = "isOverridable": false, "displayType": "host", "isVisible": true, + "isObserved": true, //"domain": "global", "serviceName": "OOZIE", "category": "Oozie Server", @@ -1583,6 +1603,20 @@ module.exports = }, { "id": "puppet var", + "name": "oozie_jdbc_connection_url", + "displayName": "Database URL", + "description": "The JDBC connection URL to the database", + "defaultValue": " ", // set to a space to not include this in initial error count + "isReconfigurable": true, + "isOverridable": false, + "displayType": "advanced", + "isVisible": true, + "serviceName": "OOZIE", + "category": "Oozie Server", + "index": 6 + }, + { + "id": "puppet var", "name": "oozie_data_dir", "displayName": "Oozie Data Dir", "description": "Data directory in which the Oozie DB exists", @@ -1596,7 +1630,7 @@ module.exports = "domain": "global", "serviceName": "OOZIE", "category": "Oozie Server", - "index": 6 + "index": 7 }, { "id": "puppet var", @@ -1623,6 +1657,7 @@ module.exports = "isOverridable": false, "displayType": "host", "isVisible": false, + "isObserved": true, //"domain": "global", "serviceName": "OOZIE", "category": "Oozie Server" @@ -1637,6 +1672,7 @@ module.exports = "isOverridable": false, "displayType": "host", "isVisible": false, + "isObserved": true, //"domain": "global", "serviceName": "OOZIE", "category": "Oozie Server"
