You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/05/22 21:02:23 UTC
[2/2] ambari git commit: AMBARI-11344. Categorize and appropriately
label/describe HiveServer2, Hive Metastore,
and Hive CLI heap size settings (alexantonenko)
AMBARI-11344. Categorize and appropriately label/describe HiveServer2, Hive Metastore, and Hive CLI heap size settings (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6a572bb2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6a572bb2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6a572bb2
Branch: refs/heads/trunk
Commit: 6a572bb2053545800221bba2e8af0a2a6144066a
Parents: 52aaaa0
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri May 22 19:12:22 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri May 22 21:55:16 2015 +0300
----------------------------------------------------------------------
.../app/controllers/wizard/step7_controller.js | 1 -
ambari-web/app/data/HDP2/site_properties.js | 28 ++++++++++++++++++--
ambari-web/app/models/stack_service.js | 6 +++--
3 files changed, 30 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a572bb2/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index e1faf39..59bcc63 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -610,7 +610,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
App.config.addAdvancedConfigs(configs, advancedConfigs);
this.set('groupsToDelete', this.get('wizardController').getDBProperty('groupsToDelete') || []);
-
if (this.get('wizardController.name') === 'addServiceController') {
App.router.get('configurationController').getConfigsByTags(this.get('serviceConfigTags')).done(function (loadedConfigs) {
self.setInstalledServiceConfigs(self.get('serviceConfigTags'), configs, loadedConfigs, self.get('installedServiceNames'));
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a572bb2/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 1ea26a5..1b36ac5 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -454,18 +454,42 @@ var hdp2properties = [
},
{
"id": "site property",
+ "name": "hive.metastore.heapsize", // the default value is overwritten in code
+ "displayName": "Hive Metastore heapsize",
+ "isOverridable": false,
+ "category": "HIVE_METASTORE",
+ "serviceName": "HIVE",
+ "filename": "hive-env.xml",
+ "displayType": "int",
+ "unit": "MB",
+ "index": 11
+ },
+ {
+ "id": "site property",
"name": "hive.heapsize",
- "displayName": "Hive heap size",
+ "displayName": "HiveServer2 heap size",
"displayType": "int",
"unit": "MB",
"isOverridable": false,
"serviceName": "HIVE",
"filename": "hive-site.xml",
- "category": "General",
+ "category": "HIVE_SERVER2",
"index": 9
},
{
"id": "site property",
+ "name": "hive.client.heapsize",
+ "displayName": "Hive Client heapsize",
+ "isOverridable": false,
+ "category": "HIVE_CLIENT",
+ "serviceName": "HIVE",
+ "filename": "hive-env.xml",
+ "displayType": "int",
+ "unit": "MB",
+ "index": 10
+ },
+ {
+ "id": "site property",
"name": "javax.jdo.option.ConnectionUserName",
"displayName": "Database Username",
"displayType": "user",
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a572bb2/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index dcdb60b..e86a312 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -168,7 +168,7 @@ App.StackService = DS.Model.extend({
var configTypes = this.get('configTypes');
var serviceComponents = this.get('serviceComponents');
if (configTypes && Object.keys(configTypes).length) {
- var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$"];
+ var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "HIVE_SERVER2", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$"];
configCategories = App.StackService.configCategories.call(this).filter(function (_configCategory) {
var serviceComponentName = _configCategory.get('name');
var isServiceComponent = serviceComponents.someProperty('componentName', serviceComponentName);
@@ -259,7 +259,9 @@ App.StackService.configCategories = function () {
App.ServiceConfigCategory.create({ name: 'HIVE_METASTORE', displayName: 'Hive Metastore'}),
App.ServiceConfigCategory.create({ name: 'WEBHCAT_SERVER', displayName: 'WebHCat Server'}),
App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
- App.ServiceConfigCategory.create({ name: 'Performance', displayName: 'Performance'})
+ App.ServiceConfigCategory.create({ name: 'Performance', displayName: 'Performance'}),
+ App.ServiceConfigCategory.create({ name: 'HIVE_SERVER2', displayName: 'Hive Server2'}),
+ App.ServiceConfigCategory.create({ name: 'HIVE_CLIENT', displayName: 'Hive Client'})
]);
break;
case 'HBASE':