ambari git commit: AMBARI-11099. Implement UI for Nimbus HA (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk d9a834983 - 9c3e5dd22
AMBARI-11099. Implement UI for Nimbus HA (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c3e5dd2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c3e5dd2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c3e5dd2
Branch: refs/heads/trunk
Commit: 9c3e5dd22c110d6ecc6fb26b211130a8efb1ffb5
Parents: d9a8349
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Wed May 13 13:24:15 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Wed May 13 13:46:50 2015 +0300
--
ambari-web/app/controllers/main/host/details.js | 74 +++-
ambari-web/app/controllers/main/service/item.js | 4 +-
ambari-web/app/messages.js | 4 +-
ambari-web/app/views/main/service/item.js | 6 ++
4 files changed, 52 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c3e5dd2/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js
b/ambari-web/app/controllers/main/host/details.js
index 02d02ad..05335aa 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -680,38 +680,48 @@ App.MainHostDetailsController = Em.Controller.extend({
* @method onLoadStormConfigs
*/
onLoadStormConfigs: function (data) {
-var
- nimbusHost = this.get('nimbusHost'),
- stormNimbusHosts = this.getStormNimbusHosts(),
- configs = {},
- attributes = {};
-
- data.items.forEach(function (item) {
- configs[item.type] = item.properties;
- attributes[item.type] = item.properties_attributes || {};
- }, this);
-
- configs['storm-site']['nimbus.seeds'] = stormNimbusHosts.join(',');
- var groups = [
- {
- properties: {
- 'storm-site': configs['storm-site'],
- 'storm-env': configs['storm-env']
- },
- properties_attributes: {
- 'storm-site': attributes['storm-site'],
- 'storm-env': attributes['storm-env']
- }
- },
- {
- properties: {
- 'core-site': configs['core-site']
- },
- properties_attributes: {
- 'core-site': attributes['core-site']
- }
- }
- ];
+var nimbusHost = this.get('nimbusHost'),
+stormNimbusHosts = this.getStormNimbusHosts(),
+configs = {},
+attributes = {};
+
+data.items.forEach(function (item) {
+ configs[item.type] = item.properties;
+ attributes[item.type] = item.properties_attributes || {};
+}, this);
+
+configs['storm-site']['nimbus.seeds'] = stormNimbusHosts.join(',');
+
+if (stormNimbusHosts.length 1) {
+ // for HA Nimbus
+ configs['storm-site']['topology.max.replication.wait.time.sec'] = '-1';
+ configs['storm-site']['topology.min.replication.count'] = '2';
+} else {
+ // for non-HA Nimbus
+ configs['storm-site']['topology.max.replication.wait.time.sec'] =
App.StackConfigProperty.find().findProperty('name',
'topology.max.replication.wait.time.sec').get('value');
+ configs['storm-site']['topology.min.replication.count'] =
App.StackConfigProperty.find().findProperty('name',
'topology.min.replication.count').get('value');
+}
+
+var groups = [
+ {
+properties: {
+ 'storm-site': configs['storm-site'],
+ 'storm-env': configs['storm-env']
+},
+properties_attributes: {
+ 'storm-site': attributes['storm-site'],
+ 'storm-env': attributes['storm-env']
+}
+ },
+ {
+properties: {
+ 'core-site': configs['core-site']
+},
+properties_attributes: {
+ 'core-site': attributes['core-site']
+}
+ }
+];
this.saveConfigsBatch(groups, 'NIMBUS', nimbusHost);
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c3e5dd2/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js
b/ambari-web/app/controllers/main/service/item.js
index 62f28e3..ad33b98 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -54,7 +54,7 @@ App.MainServiceItemController = Em.Controller.extend({
var hostNames = App.Host.find().mapProperty('hostName');
this.set('allHosts', hostNames);
- ['HBASE_MASTER',
ambari git commit: AMBARI-10473. Change default ports for HBase in Ambari. Additional patch (dlysnichenko)
Repository: ambari Updated Branches: refs/heads/trunk 1aa1ad292 - d9a834983 AMBARI-10473. Change default ports for HBase in Ambari. Additional patch (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d9a83498 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d9a83498 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d9a83498 Branch: refs/heads/trunk Commit: d9a834983feeb803fa7f23db18dea3d186d525fc Parents: 1aa1ad2 Author: Lisnichenko Dmitro dlysniche...@hortonworks.com Authored: Wed May 13 13:29:20 2015 +0300 Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com Committed: Wed May 13 13:29:20 2015 +0300 -- .../stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d9a83498/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml index 43f872a..12cd44b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/hbase-site.xml @@ -27,7 +27,7 @@ /property property namehbase.master.info.port/name -value60010/value +value16010/value descriptionThe port for the HBase Master web UI./description /property property
ambari git commit: AMBARI-11103. Ambari Upgrade from 2.0.0 to 2.1.0 fails due to StackEntity (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk e7955140c - 88947af23
AMBARI-11103. Ambari Upgrade from 2.0.0 to 2.1.0 fails due to StackEntity
(dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/88947af2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/88947af2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/88947af2
Branch: refs/heads/trunk
Commit: 88947af23d601f702760954ce8d47f33fc445a8e
Parents: e795514
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Wed May 13 16:29:26 2015 +0300
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Wed May 13 16:29:26 2015 +0300
--
.../ambari/server/upgrade/UpgradeCatalog200.java | 1 +
.../ambari/server/upgrade/UpgradeCatalog210.java | 14 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/88947af2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
index d2b9610..6b634ec 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
@@ -201,6 +201,7 @@ public class UpgradeCatalog200 extends
AbstractUpgradeCatalog {
columns.add(new DBColumnInfo(upgrade_package, String.class, 255,
null, false));
columns.add(new DBColumnInfo(repositories,char[].class, null,
null, false));
dbAccessor.createTable(repo_version, columns, repo_version_id);
+
dbAccessor.executeQuery(INSERT INTO ambari_sequences(sequence_name,
sequence_value) VALUES('repo_version_id_seq', 0), false);
dbAccessor.executeQuery(ALTER TABLE repo_version ADD CONSTRAINT
UQ_repo_version_display_name UNIQUE (display_name));
dbAccessor.executeQuery(ALTER TABLE repo_version ADD CONSTRAINT
UQ_repo_version_stack_version UNIQUE (stack, version));
http://git-wip-us.apache.org/repos/asf/ambari/blob/88947af2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index c27849b..c023ae1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -160,8 +160,8 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
columns.add(new DBColumnInfo(action, String.class, 255, null, false));
columns.add(new DBColumnInfo(cluster_name, String.class, 100, null,
false));
columns.add(new DBColumnInfo(bp_name, String.class, 100, null, false));
-columns.add(new DBColumnInfo(cluster_properties, byte[].class, null,
null, false));
-columns.add(new DBColumnInfo(cluster_attributes, byte[].class, null,
null, false));
+columns.add(new DBColumnInfo(cluster_properties, char[].class, null,
null, false));
+columns.add(new DBColumnInfo(cluster_attributes, char[].class, null,
null, false));
columns.add(new DBColumnInfo(description, String.class, 1024, null,
false));
dbAccessor.createTable(TOPOLOGY_REQUEST_TABLE, columns, id);
@@ -169,8 +169,8 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
columns.clear();
columns.add(new DBColumnInfo(id, Long.class, null, null, false));
columns.add(new DBColumnInfo(name, String.class, 255, null, false));
-columns.add(new DBColumnInfo(group_properties, byte[].class, null, null,
false));
-columns.add(new DBColumnInfo(group_attributes, byte[].class, null, null,
false));
+columns.add(new DBColumnInfo(group_properties, char[].class, null, null,
false));
+columns.add(new DBColumnInfo(group_attributes, char[].class, null, null,
false));
columns.add(new DBColumnInfo(request_id, Long.class, null, null, false));
dbAccessor.createTable(TOPOLOGY_HOST_GROUP_TABLE, columns, id);
@@ -497,14 +497,14 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
columns.add(new DBColumnInfo(id, Long.class,null, null, false));
columns.add(new DBColumnInfo(widget_name, String.class, 255, null,
false));
columns.add(new DBColumnInfo(widget_type, String.class, 255, null,
false));
-columns.add(new DBColumnInfo(metrics, byte[].class, null, null,
true));
+
[1/2] ambari git commit: AMBARI-11095 Configs: filtering issues and changes. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 88947af23 - 833caa343
AMBARI-11095 Configs: filtering issues and changes. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed138a29
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed138a29
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed138a29
Branch: refs/heads/trunk
Commit: ed138a290a5e9f342ba40708e7b8dc68df8c701c
Parents: 88947af
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Wed May 13 16:01:51 2015 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Wed May 13 16:41:59 2015 +0300
--
.../controllers/main/service/info/configs.js| 9 ++---
.../app/controllers/wizard/step7_controller.js | 17 -
ambari-web/app/messages.js | 6 +++-
.../mixins/common/configs/enhanced_configs.js | 5 ++-
.../configs/objects/service_config_property.js | 9 +
ambari-web/app/models/configs/tab.js| 14 ++--
.../templates/common/configs/service_config.hbs | 7 +++-
.../common/configs/service_config_wizard.hbs| 7 +++-
.../templates/common/filter_combo_cleanable.hbs | 8 +
.../views/common/configs/service_config_view.js | 37
.../configs/service_configs_by_category_view.js | 4 +--
.../app/views/common/filter_combo_cleanable.js | 17 +
.../test/controllers/wizard/step7_test.js | 4 +--
.../test/mappers/configs/themes_mapper_test.js | 12 ---
.../service_configs_by_category_view_test.js| 4 +--
15 files changed, 125 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed138a29/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 318a26c..52e6785 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -229,14 +229,9 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
dependentOn: 'isCompareMode'
},
{
- attributeName: 'isValid',
- attributeValue: false,
- caption: 'common.combobox.dropdown.issues'
-},
-{
- attributeName: 'warn',
+ attributeName: 'hasIssues',
attributeValue: true,
- caption: 'common.combobox.dropdown.warnings'
+ caption: 'common.combobox.dropdown.issues'
}
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed138a29/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 d62a12f..4a7c2df 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -217,31 +217,26 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
caption: 'common.combobox.dropdown.final'
},
{
- attributeName: 'isValid',
- attributeValue: false,
- caption: 'common.combobox.dropdown.issues'
-},
-{
- attributeName: 'warn',
+ attributeName: 'hasIssues',
attributeValue: true,
- caption: 'common.combobox.dropdown.warnings'
+ caption: 'common.combobox.dropdown.issues'
}
],
issuesFilterText: function () {
return (this.get('isSubmitDisabled') !this.get('submitButtonClicked')
- this.get('filterColumns').findProperty('attributeName',
'isValid').get('selected')) ?
+ this.get('filterColumns').findProperty('attributeName',
'hasIssues').get('selected')) ?
Em.I18n.t('installer.step7.showingPropertiesWithIssues') : '';
}.property('isSubmitDisabled', 'submitButtonClicked',
'filterColumns.@each.selected'),
issuesFilterLinkText: function () {
-if (this.get('filterColumns').findProperty('attributeName',
'isValid').get('selected')) {
+if (this.get('filterColumns').findProperty('attributeName',
'hasIssues').get('selected')) {
return Em.I18n.t('installer.step7.showAllProperties');
}
return (this.get('isSubmitDisabled') !this.get('submitButtonClicked')) ?
(
-this.get('filterColumns').findProperty('attributeName',
'isValid').get('selected') ?
+this.get('filterColumns').findProperty('attributeName',
'hasIssues').get('selected') ?
Em.I18n.t('installer.step7.showAllProperties') :
Em.I18n.t('installer.step7.showPropertiesWithIssues')
) : '';
}.property('isSubmitDisabled', 'submitButtonClicked',
[2/2] ambari git commit: AMBARI-11105 yarn.resourcemanager.zk-address is not updated when adding/removing ZKs. (ababiichuk)
AMBARI-11105 yarn.resourcemanager.zk-address is not updated when
adding/removing ZKs. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/833caa34
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/833caa34
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/833caa34
Branch: refs/heads/trunk
Commit: 833caa343703e8d0736924c7844c3802a00e00f6
Parents: ed138a2
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Wed May 13 16:36:20 2015 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Wed May 13 16:42:00 2015 +0300
--
ambari-web/app/controllers/main/host/details.js | 1 +
ambari-web/test/controllers/main/host/details_test.js | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/833caa34/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js
b/ambari-web/app/controllers/main/host/details.js
index 05335aa..1d1f965 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -1184,6 +1184,7 @@ App.MainHostDetailsController = Em.Controller.extend({
}
if (configs['yarn-site']) {
configs['yarn-site']['hadoop.registry.zk.quorum'] = zksWithPort;
+configs['yarn-site']['yarn.resourcemanager.zk-address'] = zksWithPort;
}
}
return true;
http://git-wip-us.apache.org/repos/asf/ambari/blob/833caa34/ambari-web/test/controllers/main/host/details_test.js
--
diff --git a/ambari-web/test/controllers/main/host/details_test.js
b/ambari-web/test/controllers/main/host/details_test.js
index 1a7c2ca..f0df0f2 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -891,7 +891,8 @@ describe('App.MainHostDetailsController', function () {
App.set('currentStackVersion', 'HDP-2.2.0');
expect(controller.setZKConfigs(configs, 'host1:2181', [])).to.be.true;
expect(configs).to.eql({yarn-site: {
-'hadoop.registry.zk.quorum': host1:2181
+'hadoop.registry.zk.quorum': host1:2181,
+'yarn.resourcemanager.zk-address': host1:2181
}});
App.set('currentStackVersion', version);
});
ambari git commit: AMBARI-11049. Some Hadoop Directory Parameters Are Wrong On Runnings Processes After Upgrade - part 2 (ncole)
Repository: ambari Updated Branches: refs/heads/trunk f33e58389 - e7955140c AMBARI-11049. Some Hadoop Directory Parameters Are Wrong On Runnings Processes After Upgrade - part 2 (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7955140 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7955140 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7955140 Branch: refs/heads/trunk Commit: e7955140cd6c6485d63f3ebd63583b47a6c925c3 Parents: f33e583 Author: Nate Cole nc...@hortonworks.com Authored: Wed May 13 09:16:56 2015 -0400 Committer: Nate Cole nc...@hortonworks.com Committed: Wed May 13 09:16:56 2015 -0400 -- .../common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/e7955140/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py index 99522c1..205d012 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py @@ -47,6 +47,7 @@ conf_dir = status_params.conf_dir server_conf_dir = status_params.server_conf_dir # service locations +hadoop_prefix = /usr/hdp/current/hadoop-client hadoop_bin_dir = conf_select.get_hadoop_dir(bin) zookeeper_home = /usr/hdp/current/zookeeper-client
ambari git commit: AMBARI-11104. Upgrade 2.0.0-2.0.1 on oracle database failed (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.maint 11695e4fe - b1f340337
AMBARI-11104. Upgrade 2.0.0-2.0.1 on oracle database failed (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1f34033
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1f34033
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1f34033
Branch: refs/heads/branch-2.0.maint
Commit: b1f3403372e9f2ec74011c6c09a7dcfb2e676fa1
Parents: 11695e4
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Wed May 13 16:23:53 2015 +0300
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Wed May 13 16:23:53 2015 +0300
--
.../server/upgrade/UpgradeCatalog200.java | 21 +---
1 file changed, 18 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1f34033/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
index 1b22c89..ffd4bba 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java
@@ -177,6 +177,21 @@ public class UpgradeCatalog200 extends
AbstractUpgradeCatalog {
}
/**
+ * Analog for ListString.contains
+ * @param s string element to be searched
+ * @param l collection of strings
+ * @return result of contains operation
+ */
+ public boolean containsCaseInsensitive(String s, ListString l){
+for (String listItem : l){
+ if (listItem.equalsIgnoreCase(s)){
+return true;
+ }
+}
+return false;
+ }
+
+ /**
* Execute all of the alert DDL updates.
*
* @throws AmbariException
@@ -220,16 +235,16 @@ public class UpgradeCatalog200 extends
AbstractUpgradeCatalog {
columns.add(new DBColumnInfo(version, String.class, 255,
null, false));
columns.add(new DBColumnInfo(display_name,String.class, 128,
null, false));
columns.add(new DBColumnInfo(upgrade_package, String.class, 255,
null, false));
-columns.add(new DBColumnInfo(repositories,char[].class, null,
null, false));
+columns.add(new DBColumnInfo(repositories, char[].class, null, null,
false));
dbAccessor.createTable(repo_version, columns, repo_version_id);
addSequence(repo_version_id_seq, 0);
ListString indexes = dbAccessor.getIndexesList(repo_version, true);
-if (!indexes.contains(uq_repo_version_display_name)) {
+if (!containsCaseInsensitive(uq_repo_version_display_name, indexes)) {
dbAccessor.executeQuery(ALTER TABLE repo_version ADD CONSTRAINT
UQ_repo_version_display_name UNIQUE (display_name));
}
-if (!indexes.contains(uq_repo_version_stack_version)) {
+if (!containsCaseInsensitive(uq_repo_version_stack_version, indexes)) {
dbAccessor.executeQuery(ALTER TABLE repo_version ADD CONSTRAINT
UQ_repo_version_stack_version UNIQUE (stack, version));
}
ambari git commit: AMBARI-11046 Added recursive permissions for subdirs on hive
Repository: ambari Updated Branches: refs/heads/trunk 833caa343 - cd4f302fd AMBARI-11046 Added recursive permissions for subdirs on hive Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cd4f302f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cd4f302f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cd4f302f Branch: refs/heads/trunk Commit: cd4f302fde9ad1d4fbcaba3a1f5040613b2cb0c9 Parents: 833caa3 Author: âErin eb...@redhat.com Authored: Tue May 12 12:13:03 2015 -0400 Committer: âErin eb...@redhat.com Committed: Tue May 12 12:16:42 2015 -0400 -- .../2.3.GlusterFS/services/HIVE/configuration/hive-site.xml | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/cd4f302f/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml index 6cfb4ec..3510dbc 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml @@ -70,6 +70,13 @@ limitations under the License. /property property +namehive.warehouse.subdir.inherit.perms/name +valuetrue/value +descriptionIf true, subdirectories inherit the same permissions/description + /property + + + property namehive.metastore.cache.pinobjtypes/name valueTable,Database,Type,FieldSchema,Order/value descriptionList of comma separated metastore object types that should be pinned in the cache/description
[2/2] ambari git commit: AMBARI-11086 - Upgrade Pack Configure Task Must Preserve Additions When Deleting (jonathanhurley)
AMBARI-11086 - Upgrade Pack Configure Task Must Preserve Additions When Deleting (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e4cba5c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e4cba5c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e4cba5c Branch: refs/heads/trunk Commit: 7e4cba5cfb5b2c853a4472244ea0a5b660dcf7eb Parents: cd4f302 Author: Jonathan Hurley jhur...@hortonworks.com Authored: Tue May 12 16:26:45 2015 -0400 Committer: Jonathan Hurley jhur...@hortonworks.com Committed: Wed May 13 10:34:37 2015 -0400 -- .../libraries/functions/conf_select.py | 99 +++- .../libraries/functions/format.py | 10 +- .../libraries/functions/hdp_select.py | 53 .../server/checks/ClientRetryPropertyCheck.java | 2 +- .../serveraction/upgrades/ConfigureAction.java | 142 +-- .../ambari/server/state/ConfigMergeHelper.java | 6 +- .../0.5.0.2.1/package/scripts/falcon_client.py | 3 +- .../0.5.0.2.1/package/scripts/falcon_server.py | 3 +- .../1.4.0.2.0/package/scripts/flume_handler.py | 7 +- .../0.96.0.2.0/package/scripts/hbase_client.py | 5 +- .../HBASE/0.96.0.2.0/package/scripts/upgrade.py | 3 +- .../HDFS/2.1.0.2.0/package/scripts/datanode.py | 3 +- .../2.1.0.2.0/package/scripts/hdfs_client.py| 3 +- .../2.1.0.2.0/package/scripts/journalnode.py| 3 +- .../HDFS/2.1.0.2.0/package/scripts/namenode.py | 3 +- .../0.12.0.2.0/package/scripts/hive_client.py | 3 +- .../package/scripts/hive_metastore.py | 3 +- .../0.12.0.2.0/package/scripts/hive_server.py | 3 +- .../package/scripts/webhcat_server.py | 3 +- .../KAFKA/0.8.1.2.2/package/scripts/upgrade.py | 3 +- .../0.5.0.2.2/package/scripts/knox_gateway.py | 3 +- .../4.0.0.2.0/package/scripts/oozie_client.py | 3 +- .../4.0.0.2.0/package/scripts/oozie_server.py | 3 +- .../0.12.0.2.0/package/scripts/pig_client.py| 3 +- .../RANGER/0.4.0/package/scripts/upgrade.py | 3 +- .../0.60.0.2.2/package/scripts/slider_client.py | 9 +- .../package/scripts/job_history_server.py | 4 +- .../1.2.0.2.2/package/scripts/spark_client.py | 3 +- .../1.4.4.2.0/package/scripts/sqoop_client.py | 4 +- .../0.9.1.2.1/package/scripts/drpc_server.py| 3 +- .../STORM/0.9.1.2.1/package/scripts/nimbus.py | 3 +- .../0.9.1.2.1/package/scripts/nimbus_prod.py| 3 +- .../STORM/0.9.1.2.1/package/scripts/rest_api.py | 3 +- .../0.9.1.2.1/package/scripts/supervisor.py | 3 +- .../package/scripts/supervisor_prod.py | 3 +- .../0.9.1.2.1/package/scripts/ui_server.py | 3 +- .../TEZ/0.4.0.2.1/package/scripts/tez_client.py | 3 +- .../scripts/application_timeline_server.py | 3 +- .../2.1.0.2.0/package/scripts/historyserver.py | 3 +- .../package/scripts/mapreduce2_client.py| 3 +- .../2.1.0.2.0/package/scripts/nodemanager.py| 3 +- .../package/scripts/resourcemanager.py | 3 +- .../2.1.0.2.0/package/scripts/yarn_client.py| 3 +- .../3.4.5.2.0/package/scripts/zookeeper.py | 3 +- .../package/scripts/zookeeper_client.py | 3 +- .../package/scripts/zookeeper_server.py | 3 +- .../checks/ClientRetryPropertyCheckTest.java| 2 +- .../upgrades/ConfigureActionTest.java | 243 ++- ambari-server/src/test/python/TestUtils.py | 35 +++ .../python/stacks/2.0.6/HDFS/test_namenode.py | 4 +- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 2 +- .../ZOOKEEPER/configuration/zoo.cfg.xml | 62 + 52 files changed, 641 insertions(+), 153 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/7e4cba5c/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py -- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py index 63b474f..7c5c005 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py @@ -23,8 +23,47 @@ __all__ = [select, create, get_hadoop_conf_dir, get_hadoop_dir] import version from resource_management.core import shell from resource_management.core.exceptions import Fail +from resource_management.core.logger import Logger +from resource_management.libraries.functions.default import default +from resource_management.libraries.functions.get_hdp_version import get_hdp_version from resource_management.libraries.script.script import Script +# a mapping of
[2/2] ambari git commit: AMBARI-11102 Widgets: bugs + edits v6. (atkach)
AMBARI-11102 Widgets: bugs + edits v6. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df3fca0f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df3fca0f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df3fca0f
Branch: refs/heads/trunk
Commit: df3fca0fb5b60d52bc7bbfb149e1a178f47d640c
Parents: 7edcfc4
Author: Andrii Tkach atk...@hortonworks.com
Authored: Wed May 13 15:30:17 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Wed May 13 18:04:38 2015 +0300
--
.../service/widgets/create/step3_controller.js | 11 +
.../service/widgets/create/wizard_controller.js | 47
.../main/service/widgets/edit_controller.js | 38
.../app/mixins/common/widgets/widget_mixin.js | 16 ++-
ambari-web/app/routes/add_widget.js | 23 +-
.../main/service/widgets/create/step3.hbs | 8 +---
6 files changed, 67 insertions(+), 76 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/df3fca0f/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js
--
diff --git
a/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js
b/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js
index 43bd968..f946b74 100644
--- a/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js
+++ b/ambari-web/app/controllers/main/service/widgets/create/step3_controller.js
@@ -141,19 +141,12 @@ App.WidgetWizardStep3Controller = Em.Controller.extend({
},
cancel: function () {
-var controller = App.router.get('widgetEditController');
+var controller = App.router.get(this.get('content.controllerName'));
controller.cancel();
},
complete: function () {
App.router.send('complete', this.collectWidgetData());
-var editController = App.router.get('widgetEditController');
-editController.finish();
-if (editController.get('popup')) {
- editController.get('popup').hide();
-}
-var serviceName = editController.get('content.widgetService');
-var service = App.Service.find().findProperty('serviceName', serviceName);
-App.router.transitionTo('main.services.service', service);
+App.router.get(this.get('content.controllerName')).finishWizard();
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/df3fca0f/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
--
diff --git
a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
index 46bf60f..940f7c8 100644
---
a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
+++
b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
@@ -313,6 +313,53 @@ App.WidgetWizardController = App.WizardController.extend({
this.saveTasksRequestIds(undefined);
},
+ cancel: function () {
+var self = this;
+var step3Controller = App.router.get('widgetWizardStep3Controller');
+return App.ModalPopup.show({
+ header: Em.I18n.t('common.warning'),
+ bodyClass: Em.View.extend({
+template: Ember.Handlebars.compile('{{t alerts.saveChanges}}')
+ }),
+ primary: Em.I18n.t('common.save'),
+ secondary: Em.I18n.t('common.discard'),
+ third: Em.I18n.t('common.cancel'),
+ disablePrimary: function () {
+return !(parseInt(self.get('currentStep')) === self.get('totalSteps')
!step3Controller.get('isSubmitDisabled'));
+ }.property(''),
+ onPrimary: function () {
+App.router.send('complete', step3Controller.collectWidgetData());
+this.onSecondary();
+ },
+ onSecondary: function () {
+this.hide();
+self.finishWizard();
+ },
+ onThird: function () {
+this.hide();
+ }
+});
+ },
+
+ /**
+ * finish wizard
+ */
+ finishWizard: function () {
+this.finish();
+this.get('popup').hide();
+var serviceName = this.get('content.widgetService');
+var service = App.Service.find().findProperty('serviceName', serviceName);
+App.router.transitionTo('main.services.service', service);
+if (!App.get('testMode')) {
+ App.clusterStatus.setClusterStatus({
+clusterName: App.router.getClusterName(),
+clusterState: 'DEFAULT',
+localdb: App.db.data
+ });
+}
+ },
+
+
/**
* Clear all temporary data
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/df3fca0f/ambari-web/app/controllers/main/service/widgets/edit_controller.js
ambari git commit: Revert AMBARI-10818. Hit re-install when performing an RU - UI seems to have stuck at installing even though the request has completed (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 7e4cba5cf - 27f566dd7
Revert AMBARI-10818. Hit re-install when performing an RU - UI seems to have
stuck at installing even though the request has completed (dlysnichenko)
This reverts commit ac1ba0e4f2595e4dc109f3aa5a0ae06f47f4c012.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27f566dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27f566dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27f566dd
Branch: refs/heads/trunk
Commit: 27f566dd7d456aa585c9ebeebfb49574d25c5679
Parents: 7e4cba5
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Wed May 13 17:46:35 2015 +0300
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Wed May 13 17:46:35 2015 +0300
--
.../DistributeRepositoriesActionListener.java | 163 +--
.../server/agent/TestHeartbeatHandler.java | 3 -
2 files changed, 77 insertions(+), 89 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/27f566dd/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
index 21e3a48..5600ef1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
@@ -19,7 +19,6 @@ package org.apache.ambari.server.events.listeners.upgrade;
import java.util.List;
-import com.google.inject.persist.UnitOfWork;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.EagerSingleton;
import org.apache.ambari.server.actionmanager.HostRoleStatus;
@@ -68,9 +67,6 @@ public class DistributeRepositoriesActionListener {
@Inject
private RepositoryVersionDAO repoVersionDAO;
- @Inject
- private UnitOfWork unitOfWork;
-
/**
* Constructor.
@@ -89,101 +85,96 @@ public class DistributeRepositoriesActionListener {
return;
}
-try {
- unitOfWork.begin();
- if (LOG.isDebugEnabled()) {
-LOG.debug(event.toString());
- }
-
- RepositoryVersionState newHostState =
RepositoryVersionState.INSTALL_FAILED;
- Long clusterId = event.getClusterId();
- if (clusterId == null) {
-LOG.error(Distribute Repositories expected a cluster Id for host +
event.getHostname());
-return;
- }
-
- String repositoryVersion = null;
-
- if (event.getCommandReport() == null) {
-LOG.error(Command report is null, marking action as INSTALL_FAILED);
- } else {
-// Parse structured output
-try {
- DistributeRepositoriesStructuredOutput structuredOutput =
StageUtils.getGson().fromJson(
- event.getCommandReport().getStructuredOut(),
- DistributeRepositoriesStructuredOutput.class);
-
- repositoryVersion = structuredOutput.getInstalledRepositoryVersion();
-
- if
(event.getCommandReport().getStatus().equals(HostRoleStatus.COMPLETED.toString()))
{
-newHostState = RepositoryVersionState.INSTALLED;
-
-if (null != structuredOutput.getActualVersion()
-null != structuredOutput.getInstalledRepositoryVersion()
-null != structuredOutput.getStackId()
-
!structuredOutput.getActualVersion().equals(structuredOutput.getInstalledRepositoryVersion()))
{
+if (LOG.isDebugEnabled()) {
+ LOG.debug(event.toString());
+}
- // !!! getInstalledRepositoryVersion() from the agent is the one
- // entered in the UI. getActualVersion() is computed.
+RepositoryVersionState newHostState =
RepositoryVersionState.INSTALL_FAILED;
+Long clusterId = event.getClusterId();
+if (clusterId == null) {
+ LOG.error(Distribute Repositories expected a cluster Id for host +
event.getHostname());
+ return;
+}
- StackId stackId = new StackId(structuredOutput.getStackId());
- RepositoryVersionEntity version =
repoVersionDAO.findByStackAndVersion(
- stackId,
structuredOutput.getInstalledRepositoryVersion());
+String repositoryVersion = null;
+
+if (event.getCommandReport() == null) {
+ LOG.error(Command report is null, marking action as INSTALL_FAILED);
+} else {
+ // Parse structured
[1/2] ambari git commit: AMBARI-11101 Apply property changes in Yarn when ranger-yarn-plugin is enabled. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 27f566dd7 - df3fca0fb
AMBARI-11101 Apply property changes in Yarn when ranger-yarn-plugin is enabled.
(atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7edcfc4d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7edcfc4d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7edcfc4d
Branch: refs/heads/trunk
Commit: 7edcfc4d6dac9088ad019c532916c64fe1754e73
Parents: 27f566d
Author: Andrii Tkach atk...@hortonworks.com
Authored: Wed May 13 15:02:47 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Wed May 13 18:04:37 2015 +0300
--
ambari-web/app/assets/test/tests.js | 1 +
.../configs/modification_handlers/hbase.js | 8 +-
.../utils/configs/modification_handlers/hdfs.js | 8 +-
.../utils/configs/modification_handlers/hive.js | 6 --
.../utils/configs/modification_handlers/knox.js | 6 --
.../modification_handler.js | 6 ++
.../configs/modification_handlers/storm.js | 8 +-
.../utils/configs/modification_handlers/yarn.js | 71 ++
.../configs/service_configs_by_category_view.js | 7 +-
.../modification_handler_test.js| 78
10 files changed, 163 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7edcfc4d/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index eed4cc7..eeafa57 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -165,6 +165,7 @@ var files = ['test/init_model_test',
'test/utils/ui_effects_test',
'test/utils/updater_test',
'test/utils/configs/config_property_helper_test',
+ 'test/utils/configs/modification_handlers/modification_handler_test',
'test/views/common/chart/linear_time_test',
'test/views/common/configs/widgets/combo_config_widget_view_test',
'test/views/common/configs/widgets/config_widget_view_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/7edcfc4d/ambari-web/app/utils/configs/modification_handlers/hbase.js
--
diff --git a/ambari-web/app/utils/configs/modification_handlers/hbase.js
b/ambari-web/app/utils/configs/modification_handlers/hbase.js
index b5a342f..f093507 100644
--- a/ambari-web/app/utils/configs/modification_handlers/hbase.js
+++ b/ambari-web/app/utils/configs/modification_handlers/hbase.js
@@ -21,12 +21,6 @@
require('utils/configs/modification_handlers/modification_handler');
module.exports = App.ServiceConfigModificationHandler.create({
serviceId : 'HBASE',
- getConfig : function(allConfigs, configName, configFilename,
configServiceName) {
-return allConfigs.findProperty(serviceName,
configServiceName).get(configs).find(function(config) {
- return configName == config.get('name') (configFilename == null ||
configFilename == config.get('filename'));
-});
- },
-
updateConfigClasses : function(configClasses, authEnabled,
affectedProperties, addOldValue) {
if (configClasses != null) {
var xaAuthCoProcessorClass =
com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor;
@@ -91,7 +85,7 @@ module.exports = App.ServiceConfigModificationHandler.create({
var newAuthEnabledValue = authEnabled ? true : false;
var newRpcProtectionValue = authEnabled ? privacy : authentication;
- // Add Hive-Ranger configs
+ // Add HBase-Ranger configs
this.updateConfigClasses(configMasterClasses, authEnabled,
affectedProperties, configAuthEnabled.get('value') == 'true');
this.updateConfigClasses(configRegionClasses, authEnabled,
affectedProperties, configAuthEnabled.get('value') == 'true');
if (newRpcProtectionValue !== configRpcProtection.get('value')) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/7edcfc4d/ambari-web/app/utils/configs/modification_handlers/hdfs.js
--
diff --git a/ambari-web/app/utils/configs/modification_handlers/hdfs.js
b/ambari-web/app/utils/configs/modification_handlers/hdfs.js
index bff1ddd..bd18a48 100644
--- a/ambari-web/app/utils/configs/modification_handlers/hdfs.js
+++ b/ambari-web/app/utils/configs/modification_handlers/hdfs.js
@@ -21,12 +21,6 @@
require('utils/configs/modification_handlers/modification_handler');
module.exports = App.ServiceConfigModificationHandler.create({
serviceId : 'HDFS',
- getConfig : function(allConfigs, configName, configFilename,
configServiceName) {
-return allConfigs.findProperty(serviceName,
ambari git commit: Revert AMBARI-11114. Verify metrics for HDFS, YARN, HBASE are supported.
Repository: ambari
Updated Branches:
refs/heads/trunk db748e555 - 4232d32a1
Revert AMBARI-4. Verify metrics for HDFS, YARN, HBASE are supported.
This reverts commit a103aaa0b3813bc2067d3c9e9291acdb5c2494c3.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4232d32a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4232d32a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4232d32a
Branch: refs/heads/trunk
Commit: 4232d32a19d0d77e82d73c3102fd4e08a6306255
Parents: db748e5
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Wed May 13 12:39:48 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Wed May 13 12:39:48 2015 -0700
--
.../HBASE/0.96.0.2.0/metrics.json | 100
.../common-services/HDFS/2.1.0.2.0/metrics.json | 127 ---
.../YARN/2.1.0.2.0/YARN_metrics.json| 160 ---
3 files changed, 71 insertions(+), 316 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4232d32a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
index efaca33..8d08d9b 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
@@ -1379,56 +1379,6 @@
pointInTime: true,
temporal: false
},
-metrics/hbase/regionserver/ScanNext_num_ops: {
- metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.ScanNext_num_ops,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/regionserver/Increment_num_ops: {
- metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Increment_num_ops,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/regionserver/Append_num_ops: {
- metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Append_num_ops,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/regionserver/ScanNext_95th_percentile: {
- metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.ScanNext_95th_percentile,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/regionserver/Append_95th_percentile: {
- metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Append_95th_percentile,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/regionserver/Increment_95th_percentile: {
- metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Increment_95th_percentile,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/regionserver/updatesBlockedTime: {
- metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.updatesBlockedTime,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/IPC/numActiveHandler: {
- metric:
Hadoop:service=HBase,name=IPC,sub=IPC.numActiveHandler,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/IPC/numCallsInGeneralQueue: {
- metric:
Hadoop:service=HBase,name=IPC,sub=IPC.numCallsInGeneralQueue,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/IPC/numOpenConnections: {
- metric:
Hadoop:service=HBase,name=IPC,sub=IPC.numOpenConnections,
- pointInTime: true,
- temporal: false
-},
metrics/hbase/regionserver/slowAppendCount: {
metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.slowAppendCount,
pointInTime: true,
@@ -3073,56 +3023,6 @@
pointInTime: true,
temporal: false
},
-metrics/hbase/regionserver/ScanNext_num_ops: {
- metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.ScanNext_num_ops,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/regionserver/Increment_num_ops: {
- metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Increment_num_ops,
- pointInTime: true,
- temporal: false
-},
-metrics/hbase/regionserver/Append_num_ops: {
-
ambari git commit: AMBARI-11115. KMS properties are not getting set on the hdfs-site.xml and core-site.xml during adding ranger-kms service (ababiichuk via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 4232d32a1 - 1db9471e7
AMBARI-5. KMS properties are not getting set on the hdfs-site.xml and
core-site.xml during adding ranger-kms service (ababiichuk via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1db9471e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1db9471e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1db9471e
Branch: refs/heads/trunk
Commit: 1db9471e78f90dd2d30167c723a5e85c70a217bc
Parents: 4232d32
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Wed May 13 14:28:24 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Wed May 13 14:28:46 2015 -0700
--
ambari-web/app/controllers/wizard/step8_controller.js | 3 ++-
ambari-web/app/mixins/common/configs/enhanced_configs.js| 5 -
.../app/models/configs/objects/service_config_property.js | 1 +
ambari-web/app/utils/config.js | 1 +
4 files changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1db9471e/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js
b/ambari-web/app/controllers/wizard/step8_controller.js
index 39a76d8..2569723 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -860,7 +860,8 @@ App.WizardStep8Controller =
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
var configs = this.get('configs').slice(0);
var configsMap = [];
fileNamesToUpdate.forEach(function (fileName) {
- if (!fileName || /^(core)/.test(fileName)) return;
+ // TODO - Temporarily commented out before refactoring should clean it
more properly
+ // if (!fileName || /^(core)/.test(fileName)) return;
var tagName = 'version' + (new Date).getTime();
var configsToSave = configs.filterProperty('filename', fileName);
configsToSave.forEach(function (item) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1db9471e/ambari-web/app/mixins/common/configs/enhanced_configs.js
--
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 90e3a31..a30d0c9 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -570,7 +570,8 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
serviceName: stepConfigs.get('serviceName'),
filename: App.config.getOriginalFileName(Em.get(propertyToAdd,
'fileName')),
isNotSaved: !Em.get(propertyToAdd, 'isDeleted'),
-isRequired: true
+isRequired: true,
+forceUpdate: true
});
stepConfigs.get('configs').pushObject(addedProperty);
addedProperty.validate();
@@ -649,9 +650,11 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
var valueToSave = propertyToUpdate.saveRecommended ?
propertyToUpdate.recommendedValue : propertyToUpdate.value;
if (!selectedGroup || selectedGroup.get('isDefault')) {
cp.set('value', valueToSave);
+cp.set('forceUpdate', true);
} else {
if (stepConfigs.get('serviceName') !==
this.get('content.serviceName')) {
cp.set('value', cp.get('defaultValue'));
+ cp.set('forceUpdate', true);
}
var overriddenConfig = cp.get('overrides')
cp.get('overrides').findProperty('group.name', selectedGroup.get('name'));
if (overriddenConfig) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1db9471e/ambari-web/app/models/configs/objects/service_config_property.js
--
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js
b/ambari-web/app/models/configs/objects/service_config_property.js
index 4079e0c..c8971ec 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -84,6 +84,7 @@ App.ServiceConfigProperty = Em.Object.extend({
rowStyleClass: null, // CSS-Class to be applied on the row showing this
config
showAsTextBox: false,
+ forceUpdate: false,
/**
* value that is returned from server as recommended
* @type {String}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1db9471e/ambari-web/app/utils/config.js
--
diff --git
ambari git commit: AMBARI-11117. Slider View defaults to 0 for instance count of all components (Gour Saha via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 1db9471e7 - 162709a82
AMBARI-7. Slider View defaults to 0 for instance count of all components
(Gour Saha via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/162709a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/162709a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/162709a8
Branch: refs/heads/trunk
Commit: 162709a825dc6184b8d2125f6dd3d1515be36f32
Parents: 1db9471
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Wed May 13 15:46:15 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Wed May 13 15:46:15 2015 -0700
--
.../apache/ambari/view/slider/SliderAppsViewControllerImpl.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/162709a8/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index 0a540d2..5a8259f 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -1008,6 +1008,10 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
JsonElement componentJson = resourcesObj.get(component.getName());
if (componentJson != null componentJson.isJsonObject()) {
JsonObject componentObj = componentJson.getAsJsonObject();
+ if (componentObj.has(yarn.component.instances)) {
+component.setInstanceCount(Integer.parseInt(componentObj.get(
+yarn.component.instances).getAsString()));
+ }
if (componentObj.has(yarn.role.priority)) {
component.setPriority(Integer.parseInt(componentObj.get(yarn.role.priority).getAsString()));
}
ambari git commit: AMBARI-11108. Incorrect warning message in popup window during host deleting (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c8e7c98fb - 597951c1f
AMBARI-11108. Incorrect warning message in popup window during host deleting
(akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/597951c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/597951c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/597951c1
Branch: refs/heads/trunk
Commit: 597951c1f1301d465db8c4c2fbc74cd2a283457a
Parents: c8e7c98
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Wed May 13 19:28:51 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Wed May 13 19:34:19 2015 +0300
--
ambari-web/app/app.js| 2 +-
ambari-web/app/models/stack_service_component.js | 15 ---
.../test/models/stack_service_component_test.js | 12 ++--
3 files changed, 15 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/597951c1/ambari-web/app/app.js
--
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 3a2ec51..23db3a5 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -320,7 +320,7 @@ module.exports = Em.Application.create({
}.property('App.router.clusterController.isLoaded'),
addableMasterInstallerWizard: function () {
- return
App.StackServiceComponent.find().filterProperty('isMasterAddableInstallerWizard').filterProperty('showAddBtnInInstall').mapProperty('componentName')
+ return
App.StackServiceComponent.find().filterProperty('isMasterAddableInstallerWizard').mapProperty('componentName')
}.property('App.router.clusterController.isLoaded'),
multipleMasters: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/597951c1/ambari-web/app/models/stack_service_component.js
--
diff --git a/ambari-web/app/models/stack_service_component.js
b/ambari-web/app/models/stack_service_component.js
index af88bd7..bd8dcbc 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -97,7 +97,7 @@ App.StackServiceComponent = DS.Model.extend({
/** @property {Boolean} isAddableToHost - component can be added on host
details page **/
isAddableToHost: function() {
-return ((this.get('isMasterAddableInstallerWizard') ||
(this.get('isSlave') this.get('maxToInstall') 2) || this.get('isClient'))
!this.get('isHAComponentOnly'));
+return this.get('isMasterAddableInstallerWizard') ||
((this.get('isNotAddableOnlyInInstall') || this.get('isSlave') ||
this.get('isClient')) !this.get('isHAComponentOnly'));
}.property('componentName'),
/** @property {Boolean} isDeletable - component supports delete action **/
@@ -142,7 +142,7 @@ App.StackServiceComponent = DS.Model.extend({
* @property {Boolean} isMasterAddableInstallerWizard
**/
isMasterAddableInstallerWizard: function() {
-return this.get('isMaster') this.get('isMultipleAllowed')
this.get('maxToInstall') 1
!this.get('isMasterAddableOnlyOnHA').contains(this.get('componentName'));
+return this.get('isMaster') this.get('isMultipleAllowed')
!this.get('isMasterAddableOnlyOnHA') !this.get('isNotAddableOnlyInInstall');
}.property('componentName'),
/**
@@ -150,7 +150,9 @@ App.StackServiceComponent = DS.Model.extend({
* New instances of these components are added in appropriate HA wizards
* @property {Boolean} isMasterAddableOnlyOnHA
*/
- isMasterAddableOnlyOnHA: ['NAMENODE', 'RESOURCEMANAGER', 'HIVE_METASTORE',
'HIVE_SERVER', 'RANGER_ADMIN'],
+ isMasterAddableOnlyOnHA: function () {
+return ['NAMENODE', 'RESOURCEMANAGER',
'RANGER_ADMIN'].contains(this.get('componentName'));
+ }.property('componentName'),
/** @property {Boolean} isHAComponentOnly - Components that can be installed
only if HA enabled **/
isHAComponentOnly: function() {
@@ -193,10 +195,9 @@ App.StackServiceComponent = DS.Model.extend({
return !!App.StackServiceComponent.coHost[componentName];
}.property('componentName'),
- /** @property {Boolean} showAddBtnInInstall - show add button for this
component on Assign Masters **/
- showAddBtnInInstall: function() {
-var doNotShowList = ['HIVE_METASTORE', 'HIVE_SERVER'];
-return !doNotShowList.contains(this.get('componentName'));
+ /** @property {Boolean} isNotAddableOnlyInInstall - is this component
addable, except Install and Add Service Wizards **/
+ isNotAddableOnlyInInstall: function() {
+return ['HIVE_METASTORE', 'HIVE_SERVER',
'RANGER_KMS_SERVER'].contains(this.get('componentName'));
}.property('componentName')
});
ambari git commit: AMBARI-11087. Add Blueprint Support for Storm Nimbus High Availability. (rnettleton)
Repository: ambari
Updated Branches:
refs/heads/trunk df3fca0fb - c8e7c98fb
AMBARI-11087. Add Blueprint Support for Storm Nimbus High Availability.
(rnettleton)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c8e7c98f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c8e7c98f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c8e7c98f
Branch: refs/heads/trunk
Commit: c8e7c98fb3a18948cbee1d14df46d345b1890dbb
Parents: df3fca0
Author: Bob Nettleton rnettle...@hortonworks.com
Authored: Wed May 13 12:33:08 2015 -0400
Committer: Bob Nettleton rnettle...@hortonworks.com
Committed: Wed May 13 12:33:08 2015 -0400
--
.../BlueprintConfigurationProcessor.java| 47 +++-
.../BlueprintConfigurationProcessorTest.java| 120 +++
2 files changed, 165 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c8e7c98f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 7938cc1..aef6664 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -1312,6 +1312,11 @@ public class BlueprintConfigurationProcessor {
MapString, MapString, String
properties,
ClusterTopology topology) {
+ // return customer-supplied properties without updating them
+ if (isFQDNValue(origValue)) {
+return origValue;
+ }
+
return doFormat(propertyUpdater.updateForClusterCreate(propertyName,
origValue, properties, topology));
}
@@ -1330,6 +1335,19 @@ public class BlueprintConfigurationProcessor {
return propertyUpdater.getRequiredHostGroups(origValue, properties,
topology);
}
+
+/**
+ * Convenience method to determine if a property value is a
+ * customer-specified FQDN.
+ *
+ * @param value property value to examine
+ * @return true if the property represents an FQDN value
+ * false if the property does not represent an FQDN value
+ */
+public boolean isFQDNValue(String value) {
+ return !value.contains(%HOSTGROUP)
+!value.contains(localhost);
+}
}
/**
@@ -1337,8 +1355,22 @@ public class BlueprintConfigurationProcessor {
*/
private static class YamlMultiValuePropertyDecorator extends
AbstractPropertyValueDecorator {
+// currently, only plain and single-quoted Yaml flows are supported by
this updater
+enum FlowStyle {
+ SINGLE_QUOTED,
+ PLAIN
+}
+
+private final FlowStyle flowStyle;
+
public YamlMultiValuePropertyDecorator(PropertyUpdater propertyUpdater) {
+ // single-quote style is considered default by this updater
+ this(propertyUpdater, FlowStyle.SINGLE_QUOTED);
+}
+
+protected YamlMultiValuePropertyDecorator(PropertyUpdater propertyUpdater,
FlowStyle flowStyle) {
super(propertyUpdater);
+ this.flowStyle = flowStyle;
}
/**
@@ -1360,9 +1392,17 @@ public class BlueprintConfigurationProcessor {
} else {
isFirst = false;
}
- sb.append(');
+
+ if (flowStyle == FlowStyle.SINGLE_QUOTED) {
+sb.append(');
+ }
+
sb.append(value);
- sb.append(');
+
+ if (flowStyle == FlowStyle.SINGLE_QUOTED) {
+sb.append(');
+ }
+
}
sb.append(]);
}
@@ -1649,6 +1689,9 @@ public class BlueprintConfigurationProcessor {
stormSiteMap.put(nimbus.childopts, new
OptionalSingleHostTopologyUpdater(GANGLIA_SERVER));
multiStormSiteMap.put(storm.zookeeper.servers,
new YamlMultiValuePropertyDecorator(new
MultipleHostTopologyUpdater(ZOOKEEPER_SERVER)));
+multiStormSiteMap.put(nimbus.seeds,
+new YamlMultiValuePropertyDecorator(new
MultipleHostTopologyUpdater(NIMBUS),
YamlMultiValuePropertyDecorator.FlowStyle.PLAIN));
+
// FALCON
falconStartupPropertiesMap.put(*.broker.url, new
SingleHostTopologyUpdater(FALCON_SERVER));
http://git-wip-us.apache.org/repos/asf/ambari/blob/c8e7c98f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git
ambari git commit: AMBARI-11118. Create widget: Unable to add metric in expression builder box.(XIWANG)
Repository: ambari
Updated Branches:
refs/heads/trunk 162709a82 - 153895e11
AMBARI-8. Create widget: Unable to add metric in expression builder
box.(XIWANG)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/153895e1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/153895e1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/153895e1
Branch: refs/heads/trunk
Commit: 153895e11c48acd6c214f08b7cae9cdfbe054fb0
Parents: 162709a
Author: Xi Wang xiw...@apache.org
Authored: Wed May 13 17:31:13 2015 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Wed May 13 17:31:22 2015 -0700
--
.../app/views/main/service/widgets/create/expression_view.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/153895e1/ambari-web/app/views/main/service/widgets/create/expression_view.js
--
diff --git
a/ambari-web/app/views/main/service/widgets/create/expression_view.js
b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 079d420..2e6c572 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -187,8 +187,7 @@ App.AddMetricExpressionView = Em.View.extend({
}).change(function (event, obj) {
self.set('currentSelectedComponent.selectedAggregation',
obj.selected);
});
-}, 1000);
-
+}, 1600);
},
/**
ambari git commit: AMBARI-9030. Remove temporary api fields for obtaining kerberos descriptors for stacks and stack services (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 153895e11 - 9fab4435c
AMBARI-9030. Remove temporary api fields for obtaining kerberos descriptors for
stacks and stack services (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9fab4435
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9fab4435
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9fab4435
Branch: refs/heads/trunk
Commit: 9fab4435c946a1c3ca1fdab196cef19b905114b7
Parents: 153895e
Author: Robert Levas rle...@hortonworks.com
Authored: Wed May 13 21:05:34 2015 -0400
Committer: Robert Levas rle...@hortonworks.com
Committed: Wed May 13 21:05:40 2015 -0400
--
.../internal/StackServiceResourceProvider.java| 18 --
.../internal/StackVersionResourceProvider.java| 13 -
ambari-server/src/main/resources/properties.json | 2 --
3 files changed, 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9fab4435/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
index c80913e..130129a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
@@ -71,9 +71,6 @@ public class StackServiceResourceProvider extends
ReadOnlyResourceProvider {
private static final String CUSTOM_COMMANDS_PROPERTY_ID =
PropertyHelper.getPropertyId(
StackServices, custom_commands);
- private static final String KERBEROS_DESCRIPTOR_PROPERTY_ID =
PropertyHelper.getPropertyId(
- StackServices, kerberos_descriptor);
-
private static SetString pkPropertyIds = new HashSetString(
Arrays.asList(new String[] { STACK_NAME_PROPERTY_ID,
STACK_VERSION_PROPERTY_ID, SERVICE_NAME_PROPERTY_ID }));
@@ -152,21 +149,6 @@ public class StackServiceResourceProvider extends
ReadOnlyResourceProvider {
setResourceProperty(resource, CUSTOM_COMMANDS_PROPERTY_ID,
response.getCustomCommands(), requestedIds);
- // TODO (rlevas): Convert this to an official resource
- File kerberosDescriptorFile = response.getKerberosDescriptorFile();
- if (kerberosDescriptorFile != null) {
-KerberosServiceDescriptor descriptor;
-try {
- descriptor =
kerberosServiceDescriptorFactory.createInstance(kerberosDescriptorFile,
response.getServiceName());
-} catch (IOException e) {
- throw new SystemException(Failed to parse the service's Kerberos
descriptor, e);
-}
-
-if (descriptor != null) {
- setResourceProperty(resource, KERBEROS_DESCRIPTOR_PROPERTY_ID,
descriptor.toMap(), requestedIds);
-}
- }
-
resources.add(resource);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9fab4435/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
index ca66819..adc3a45 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
@@ -59,7 +59,6 @@ public class StackVersionResourceProvider extends
ReadOnlyResourceProvider {
public static final String STACK_ERROR_SET =
PropertyHelper.getPropertyId(Versions, stack-errors);
public static final String STACK_CONFIG_TYPES=
PropertyHelper.getPropertyId(Versions, config_types);
public static final String STACK_PARENT_PROPERTY_ID =
PropertyHelper.getPropertyId(Versions, parent_stack_version);
- public static final String KERBEROS_DESCRIPTOR_PROPERTY_ID =
PropertyHelper.getPropertyId(Versions, kerberos_descriptor);
public static final String UPGRADE_PACKS_PROPERTY_ID =
PropertyHelper.getPropertyId(Versions, upgrade_packs);
private static SetString pkPropertyIds = new HashSetString(
@@ -139,18 +138,6 @@ public class StackVersionResourceProvider extends
ReadOnlyResourceProvider {
setResourceProperty(resource, UPGRADE_PACKS_PROPERTY_ID,
ambari git commit: AMBARI-11121. Oozie Service Check fails because folders in /user/ambari-qa are owned by hdfs:hdfs (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 9fab4435c - c20250c5c
AMBARI-11121. Oozie Service Check fails because folders in /user/ambari-qa are
owned by hdfs:hdfs (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c20250c5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c20250c5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c20250c5
Branch: refs/heads/trunk
Commit: c20250c5c20db43fcbd71fc9f76bcce8624c3fba
Parents: 9fab443
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Wed May 13 20:12:39 2015 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Wed May 13 20:12:39 2015 -0700
--
.../4.0.0.2.0/package/scripts/service_check.py | 25
.../stacks/2.0.6/OOZIE/test_service_check.py| 24 +++
2 files changed, 44 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c20250c5/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py
index a2195d8..11f4431 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py
@@ -59,22 +59,37 @@ class OozieServiceCheckDefault(OozieServiceCheck):
os_family = System.get_instance().os_family
oozie_examples_dir = glob.glob(params.oozie_examples_regex)[0]
-
+
Execute(format({tmp_dir}/{prepare_hdfs_file_name} {conf_dir}
{oozie_examples_dir} {hadoop_conf_dir} ),
tries=3,
try_sleep=5,
logoutput=True
)
-
-params.HdfsResource(format('/user/{smokeuser}/examples'),
+
+examples_dir = format('/user/{smokeuser}/examples')
+params.HdfsResource(examples_dir,
+action = delete_on_execute,
+type = directory
+)
+params.HdfsResource(examples_dir,
action = create_on_execute,
type = directory,
source = format({oozie_examples_dir}/examples),
+ owner = params.smokeuser,
+ group = params.user_group
)
-params.HdfsResource(format('/user/{smokeuser}/input-data'),
+
+input_data_dir = format('/user/{smokeuser}/input-data')
+params.HdfsResource(input_data_dir,
+action = delete_on_execute,
+type = directory
+)
+params.HdfsResource(input_data_dir,
action = create_on_execute,
type = directory,
source = format({oozie_examples_dir}/examples/input-data),
+ owner = params.smokeuser,
+ group = params.user_group
)
params.HdfsResource(None, action=execute)
@@ -84,7 +99,7 @@ class OozieServiceCheckDefault(OozieServiceCheck):
else:
sh_cmd = format(
{tmp_dir}/{file_name} {os_family} {oozie_lib_dir} {conf_dir}
{oozie_bin_dir} {oozie_examples_dir} {hadoop_conf_dir} {hadoop_bin_dir}
{smokeuser} {security_enabled})
-
+
Execute(sh_cmd,
path=params.execute_path,
tries=3,
http://git-wip-us.apache.org/repos/asf/ambari/blob/c20250c5/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
index 151ce14..54c85e4 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py
@@ -70,11 +70,33 @@ class TestServiceCheck(RMFTestCase):
hadoop_bin_dir = '/usr/bin',
keytab = UnknownConfigurationMock(),
kinit_path_local = '/usr/bin/kinit',
+user = 'hdfs',
+action = ['delete_on_execute'],
+hadoop_conf_dir = '/etc/hadoop/conf',
+type = 'directory',
+)
+self.assertResourceCalled('HdfsResource', '/user/ambari-qa/examples',
+security_enabled = False,
+hadoop_bin_dir = '/usr/bin',
+keytab = UnknownConfigurationMock(),
+kinit_path_local = '/usr/bin/kinit',
source = '//examples',
user = 'hdfs',
action = ['create_on_execute'],
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
+owner = 'ambari-qa',
+group = 'hadoop'
+)
+self.assertResourceCalled('HdfsResource',
ambari git commit: AMBARI-11093. Implement host predicate property validation and fix issue where host name is specified explicitly in scaling request
Repository: ambari
Updated Branches:
refs/heads/trunk 597951c1f - 43dd0cddf
AMBARI-11093. Implement host predicate property validation and fix issue where
host
name is specified explicitly in scaling request
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/43dd0cdd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/43dd0cdd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/43dd0cdd
Branch: refs/heads/trunk
Commit: 43dd0cddf656bd54cda90e182786e304655b4765
Parents: 597951c
Author: John Speidel jspei...@hortonworks.com
Authored: Tue May 12 22:17:01 2015 -0400
Committer: John Speidel jspei...@hortonworks.com
Committed: Wed May 13 12:37:50 2015 -0400
--
.../ambari/server/controller/AmbariServer.java | 6 +-
.../controller/internal/BaseClusterRequest.java | 186 +
.../internal/HostResourceProvider.java | 11 +-
.../internal/ProvisionClusterRequest.java | 98 ++---
.../internal/ScaleClusterRequest.java | 155 +---
.../internal/ProvisionClusterRequestTest.java | 263 -
.../internal/ScaleClusterRequestTest.java | 394 +++
7 files changed, 987 insertions(+), 126 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/43dd0cdd/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 77f6d2c..4a30c0d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -48,14 +48,13 @@ import
org.apache.ambari.server.configuration.ComponentSSLConfiguration;
import org.apache.ambari.server.configuration.Configuration;
import
org.apache.ambari.server.controller.internal.AbstractControllerResourceProvider;
import
org.apache.ambari.server.controller.internal.AmbariPrivilegeResourceProvider;
+import org.apache.ambari.server.controller.internal.BaseClusterRequest;
import org.apache.ambari.server.controller.internal.BlueprintResourceProvider;
import
org.apache.ambari.server.controller.internal.ClusterPrivilegeResourceProvider;
import org.apache.ambari.server.controller.internal.ClusterResourceProvider;
import org.apache.ambari.server.controller.internal.HostResourceProvider;
import org.apache.ambari.server.controller.internal.PermissionResourceProvider;
import org.apache.ambari.server.controller.internal.PrivilegeResourceProvider;
-import org.apache.ambari.server.controller.internal.ProvisionClusterRequest;
-import org.apache.ambari.server.controller.internal.ScaleClusterRequest;
import
org.apache.ambari.server.controller.internal.StackAdvisorResourceProvider;
import
org.apache.ambari.server.controller.internal.StackDefinedPropertyProvider;
import
org.apache.ambari.server.controller.internal.StackDependencyResourceProvider;
@@ -616,8 +615,7 @@ public class AmbariServer {
injector.getInstance(TopologyRequestFactoryImpl.class));
HostResourceProvider.setTopologyManager(injector.getInstance(TopologyManager.class));
BlueprintFactory.init(injector.getInstance(BlueprintDAO.class));
-ProvisionClusterRequest.init(injector.getInstance(BlueprintFactory.class));
-ScaleClusterRequest.init(injector.getInstance(BlueprintFactory.class));
+BaseClusterRequest.init(injector.getInstance(BlueprintFactory.class));
AmbariContext.init(injector.getInstance(HostRoleCommandFactory.class));
PermissionResourceProvider.init(injector.getInstance(PermissionDAO.class));
http://git-wip-us.apache.org/repos/asf/ambari/blob/43dd0cdd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java
new file mode 100644
index 000..7f6a634
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java
@@ -0,0 +1,186 @@
+/**
+ * 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
ambari git commit: AMBARI-11112. HBase Service Check when adding HBase service (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 4efd4ef31 - ecfb55c8d
AMBARI-2. HBase Service Check when adding HBase service (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ecfb55c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ecfb55c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ecfb55c8
Branch: refs/heads/trunk
Commit: ecfb55c8df612cb59b8c60e9d5ce26c48b69608e
Parents: 4efd4ef
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed May 13 20:38:29 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed May 13 20:38:29 2015 +0300
--
.../0.96.0.2.0/package/scripts/service_check.py | 15 +++---
.../2.0.6/HBASE/test_hbase_service_check.py | 30
2 files changed, 10 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecfb55c8/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
index b774f19..d679314 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/service_check.py
@@ -75,22 +75,15 @@ class HbaseServiceCheckDefault(HbaseServiceCheck):
)
servicecheckcmd = format({smokeuser_kinit_cmd} {hbase_cmd} --config
{hbase_conf_dir} shell {hbase_servicecheck_file})
-smokeverifycmd = format({smokeuser_kinit_cmd}
{exec_tmp_dir}/hbaseSmokeVerify.sh {hbase_conf_dir} {service_check_data}
{hbase_cmd})
+smokeverifycmd = format({exec_tmp_dir}/hbaseSmokeVerify.sh
{hbase_conf_dir} {service_check_data} {hbase_cmd})
-Execute( servicecheckcmd,
- tries = 3,
+Execute(format({servicecheckcmd} {smokeverifycmd}),
+ tries = 6,
try_sleep = 5,
user = params.smoke_test_user,
logoutput = True
)
-
-Execute ( smokeverifycmd,
- tries = 3,
- try_sleep = 5,
- user = params.smoke_test_user,
- logoutput = True
-)
-
+
if __name__ == __main__:
HbaseServiceCheck().execute()
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecfb55c8/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
index 368aa58..a5a360a 100644
---
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
+++
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_service_check.py
@@ -44,15 +44,9 @@ class TestServiceCheck(RMFTestCase):
content = Template('hbase-smoke.sh.j2'),
mode = 0755,
)
-self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config
/etc/hbase/conf shell /tmp/hbase-smoke.sh',
+self.assertResourceCalled('Execute', ' /usr/lib/hbase/bin/hbase --config
/etc/hbase/conf shell /tmp/hbase-smoke.sh /tmp/hbaseSmokeVerify.sh
/etc/hbase/conf /usr/lib/hbase/bin/hbase',
logoutput = True,
- tries = 3,
- user = 'ambari-qa',
- try_sleep = 5,
-)
-self.assertResourceCalled('Execute', ' /tmp/hbaseSmokeVerify.sh
/etc/hbase/conf /usr/lib/hbase/bin/hbase',
- logoutput = True,
- tries = 3,
+ tries = 6,
user = 'ambari-qa',
try_sleep = 5,
)
@@ -84,15 +78,9 @@ class TestServiceCheck(RMFTestCase):
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt
/etc/security/keytabs/hbase.headless.keytab hbase; /usr/lib/hbase/bin/hbase
shell /tmp/hbase_grant_permissions.sh',
user = 'hbase',
)
-self.assertResourceCalled('Execute', '/usr/bin/kinit -kt
/etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com;
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf shell /tmp/hbase-smoke.sh',
- logoutput = True,
- tries = 3,
- user = 'ambari-qa',
- try_sleep = 5,
-)
-self.assertResourceCalled('Execute', '/usr/bin/kinit -kt
/etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com;
/tmp/hbaseSmokeVerify.sh /etc/hbase/conf /usr/lib/hbase/bin/hbase',
+self.assertResourceCalled('Execute', '/usr/bin/kinit -kt
/etc/security/keytabs/smokeuser.headless.keytab ambari...@example.com;
/usr/lib/hbase/bin/hbase --config /etc/hbase/conf shell /tmp/hbase-smoke.sh
/tmp/hbaseSmokeVerify.sh
ambari git commit: AMBARI-11107 Remove conditionals for experimental flag on enhanced dashboard work. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 43dd0cddf - 868c6da5f
AMBARI-11107 Remove conditionals for experimental flag on enhanced dashboard
work. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/868c6da5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/868c6da5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/868c6da5
Branch: refs/heads/trunk
Commit: 868c6da5fa21d7ce31c8f531ac541df858cafcf7
Parents: 43dd0cd
Author: Andrii Tkach atk...@hortonworks.com
Authored: Wed May 13 18:06:23 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Wed May 13 20:09:04 2015 +0300
--
ambari-web/app/config.js| 1 -
ambari-web/app/data/service_graph_config.js | 16 ++-
.../app/mixins/common/widgets/widget_section.js | 10 --
.../app/views/main/service/info/summary.js | 21 +++-
.../views/main/service/info/summary_test.js | 8 +---
5 files changed, 22 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/868c6da5/ambari-web/app/config.js
--
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 3b74e9e..3089f1a 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -71,7 +71,6 @@ App.supports = {
customizeAgentUserAccount: false,
installGanglia: false,
opsDuringRollingUpgrade: false,
- customizedWidgets: true,
customizedWidgetLayout: false,
enhancedConfigs: true
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/868c6da5/ambari-web/app/data/service_graph_config.js
--
diff --git a/ambari-web/app/data/service_graph_config.js
b/ambari-web/app/data/service_graph_config.js
index 17a7123..e660b5f 100644
--- a/ambari-web/app/data/service_graph_config.js
+++ b/ambari-web/app/data/service_graph_config.js
@@ -98,16 +98,12 @@ module.exports = {
},
getServiceGraphConfig: function () {
-if (App.get('supports.customizedWidgets')) {
- var servicesWithEnhancedDashboard = ['hdfs', 'yarn', 'hbase'];
- var newServiceObject = jQuery.extend(true, {}, this.allServices);
- servicesWithEnhancedDashboard.forEach(function (_serviceName) {
-newServiceObject[_serviceName] = [];
- });
- return newServiceObject;
-} else {
- return this.allServices;
-}
+var servicesWithEnhancedDashboard = ['hdfs', 'yarn', 'hbase'];
+var newServiceObject = jQuery.extend(true, {}, this.allServices);
+servicesWithEnhancedDashboard.forEach(function (_serviceName) {
+ newServiceObject[_serviceName] = [];
+});
+return newServiceObject;
}
};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/868c6da5/ambari-web/app/mixins/common/widgets/widget_section.js
--
diff --git a/ambari-web/app/mixins/common/widgets/widget_section.js
b/ambari-web/app/mixins/common/widgets/widget_section.js
index e147f5f..20863c3 100644
--- a/ambari-web/app/mixins/common/widgets/widget_section.js
+++ b/ambari-web/app/mixins/common/widgets/widget_section.js
@@ -78,7 +78,7 @@ App.WidgetSectionMixin = Ember.Mixin.create({
} else if (this.get('sectionName') === 'SYSTEM_HEATMAPS') {
isServiceWithWidgetdescriptor = true;
}
-return isServiceWithWidgetdescriptor (App.supports.customizedWidgets ||
this.sectionNameSuffix === _HEATMAPS);
+return isServiceWithWidgetdescriptor;
}.property('content.serviceName'),
/**
@@ -90,13 +90,11 @@ App.WidgetSectionMixin = Ember.Mixin.create({
* @type {Em.A}
*/
widgets: function () {
-if (this.get('isWidgetsLoaded')) {
- if (this.get('activeWidgetLayout.widgets')) {
-return this.get('activeWidgetLayout.widgets').toArray();
- }
+if (this.get('isWidgetsLoaded') this.get('activeWidgetLayout.widgets'))
{
+ return this.get('activeWidgetLayout.widgets').toArray();
}
return [];
- }.property('isWidgetsLoaded'),
+ }.property('isWidgetsLoaded', 'activeWidgetLayout.widgets'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/868c6da5/ambari-web/app/views/main/service/info/summary.js
--
diff --git a/ambari-web/app/views/main/service/info/summary.js
b/ambari-web/app/views/main/service/info/summary.js
index 515ed98..1408aee 100644
--- a/ambari-web/app/views/main/service/info/summary.js
+++ b/ambari-web/app/views/main/service/info/summary.js
@@ -308,20 +308,15 @@ App.MainServiceInfoSummaryView =
Em.View.extend(App.UserPref, {
constructGraphObjects: function(graphNames) {
ambari git commit: AMBARI-11109. Views: view.xml should include min ambari versions (alexantonenko)
Repository: ambari Updated Branches: refs/heads/trunk 868c6da5f - 00c5d3fed AMBARI-11109. Views: view.xml should include min ambari versions (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00c5d3fe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00c5d3fe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00c5d3fe Branch: refs/heads/trunk Commit: 00c5d3fed22826622d2165325473a903de474542 Parents: 868c6da Author: Alex Antonenko hiv...@gmail.com Authored: Wed May 13 19:05:44 2015 +0300 Committer: Alex Antonenko hiv...@gmail.com Committed: Wed May 13 20:32:44 2015 +0300 -- contrib/views/capacity-scheduler/src/main/resources/view.xml | 2 +- contrib/views/files/src/main/resources/view.xml | 2 +- contrib/views/hive/src/main/resources/view.xml | 2 +- contrib/views/pig/src/main/resources/view.xml| 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/00c5d3fe/contrib/views/capacity-scheduler/src/main/resources/view.xml -- diff --git a/contrib/views/capacity-scheduler/src/main/resources/view.xml b/contrib/views/capacity-scheduler/src/main/resources/view.xml index 514548d..2974f86 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/view.xml +++ b/contrib/views/capacity-scheduler/src/main/resources/view.xml @@ -18,7 +18,7 @@ nameCAPACITY-SCHEDULER/name labelCapacity Scheduler/label version0.3.0/version -min-ambari-version1.7.*/min-ambari-version +min-ambari-version2.0.*/min-ambari-version validator-classorg.apache.ambari.view.capacityscheduler.PropertyValidator/validator-class http://git-wip-us.apache.org/repos/asf/ambari/blob/00c5d3fe/contrib/views/files/src/main/resources/view.xml -- diff --git a/contrib/views/files/src/main/resources/view.xml b/contrib/views/files/src/main/resources/view.xml index 2a9eea5..dbd0643 100644 --- a/contrib/views/files/src/main/resources/view.xml +++ b/contrib/views/files/src/main/resources/view.xml @@ -19,7 +19,7 @@ labelFiles/label version0.1.0/version -min-ambari-version1.7.*/min-ambari-version +min-ambari-version2.0.*/min-ambari-version validator-classorg.apache.ambari.view.filebrowser.PropertyValidator/validator-class http://git-wip-us.apache.org/repos/asf/ambari/blob/00c5d3fe/contrib/views/hive/src/main/resources/view.xml -- diff --git a/contrib/views/hive/src/main/resources/view.xml b/contrib/views/hive/src/main/resources/view.xml index 41bcfeb..64526d5 100644 --- a/contrib/views/hive/src/main/resources/view.xml +++ b/contrib/views/hive/src/main/resources/view.xml @@ -19,7 +19,7 @@ labelHive/label version0.3.0/version -min-ambari-version1.7.*/min-ambari-version +min-ambari-version2.0.*/min-ambari-version validator-classorg.apache.ambari.view.hive.PropertyValidator/validator-class http://git-wip-us.apache.org/repos/asf/ambari/blob/00c5d3fe/contrib/views/pig/src/main/resources/view.xml -- diff --git a/contrib/views/pig/src/main/resources/view.xml b/contrib/views/pig/src/main/resources/view.xml index 6128dc4..197b44e 100644 --- a/contrib/views/pig/src/main/resources/view.xml +++ b/contrib/views/pig/src/main/resources/view.xml @@ -18,7 +18,7 @@ namePIG/name labelPig/label version0.1.0/version -min-ambari-version1.7.*/min-ambari-version +min-ambari-version2.0.*/min-ambari-version !-- HDFS Configs -- parameter
ambari git commit: AMBARI-11111. HDFS properties duplications and removals after adding Ranger KMS Server (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 00c5d3fed - 4efd4ef31
AMBARI-1. HDFS properties duplications and removals after adding Ranger KMS
Server (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4efd4ef3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4efd4ef3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4efd4ef3
Branch: refs/heads/trunk
Commit: 4efd4ef31c70ca9a95653950039ff1f711046041
Parents: 00c5d3f
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Wed May 13 20:30:56 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Wed May 13 20:35:36 2015 +0300
--
ambari-web/app/controllers/main/host/details.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4efd4ef3/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js
b/ambari-web/app/controllers/main/host/details.js
index 1d1f965..9c88a41 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -901,7 +901,7 @@ App.MainHostDetailsController = Em.Controller.extend({
var rkmsHosts = this.getRangerKMSServerHosts();
var rkmsPort = data.items.findProperty('type',
'kms-env').properties['kms_port'];
var coreSiteConfigs = data.items.findProperty('type', 'core-site');
-var hdfsSiteConfigs = data.items.findProperty('type', 'core-site');
+var hdfsSiteConfigs = data.items.findProperty('type', 'hdfs-site');
var groups = [
{
properties: {
ambari git commit: AMBARI-11113 Reduce the number of Advanced Oozie properties exposed to users in Ambari UI. (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk ecfb55c8d - 7266faea1
AMBARI-3 Reduce the number of Advanced Oozie properties exposed to users in
Ambari UI. (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7266faea
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7266faea
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7266faea
Branch: refs/heads/trunk
Commit: 7266faea1d0e74cca337e605ec82334106f8f9db
Parents: ecfb55c
Author: Dmytro Sen d...@apache.org
Authored: Wed May 13 20:50:27 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Wed May 13 20:50:27 2015 +0300
--
.../common-services/OOZIE/4.0.0.2.0/alerts.json | 4 +-
.../services/OOZIE/configuration/oozie-site.xml | 166 +++
ambari-web/app/models/quick_links.js| 4 +-
.../app/views/common/quick_view_link_view.js| 2 +-
4 files changed, 171 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7266faea/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json
index 975fea0..78e5142 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/alerts.json
@@ -11,7 +11,7 @@
source: {
type: WEB,
uri: {
-http: {{oozie-site/oozie.base.url}}/oozie,
+http: {{oozie-site/oozie.base.url}}/oozie/?user.name=oozie,
kerberos_keytab:
{{oozie-site/oozie.authentication.kerberos.keytab}},
kerberos_principal:
{{oozie-site/oozie.authentication.kerberos.principal}}
},
@@ -41,4 +41,4 @@
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7266faea/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-site.xml
new file mode 100644
index 000..dc95b6f
--- /dev/null
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-site.xml
@@ -0,0 +1,166 @@
+?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.
+--
+
+configuration supports_final=true supports_do_not_extend=true
+
+ property
+nameoozie.authentication.kerberos.name.rules/name
+value
+ RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
+ RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
+ RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
+ RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
+ DEFAULT
+/value
+descriptionThe mapping from kerberos principal names to local OS user
names./description
+ /property
+
+ property
+nameoozie.authentication.type/name
+valuesimple/value
+description
+ Authentication used for Oozie HTTP endpoint, the supported values are:
simple | kerberos |
+ #AUTHENTICATION_HANDLER_CLASSNAME#.
+/description
+ /property
+
+ property
+nameoozie.base.url/name
+valuehttp://localhost:11000/oozie/value
+descriptionBase Oozie URL./description
+ /property
+
+ property
+nameoozie.credentials.credentialclasses/name
+valuehcat=org.apache.oozie.action.hadoop.HCatCredentials/value
+description
+ Credential Class to be used for HCat.
+/description
+ /property
+
+ property
+nameoozie.service.AuthorizationService.authorization.enabled/name
+valuefalse/value
+description
+ Specifies whether security (user name/admin role) is
ambari git commit: AMBARI-11114. Verify metrics for HDFS, YARN, HBASE are supported.
Repository: ambari
Updated Branches:
refs/heads/trunk 7266faea1 - a103aaa0b
AMBARI-4. Verify metrics for HDFS, YARN, HBASE are supported.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a103aaa0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a103aaa0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a103aaa0
Branch: refs/heads/trunk
Commit: a103aaa0b3813bc2067d3c9e9291acdb5c2494c3
Parents: 7266fae
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Wed May 13 10:50:53 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Wed May 13 10:51:08 2015 -0700
--
.../HBASE/0.96.0.2.0/metrics.json | 100
.../common-services/HDFS/2.1.0.2.0/metrics.json | 127 +++
.../YARN/2.1.0.2.0/YARN_metrics.json| 160 +++
3 files changed, 316 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a103aaa0/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
index 8d08d9b..efaca33 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
@@ -1379,6 +1379,56 @@
pointInTime: true,
temporal: false
},
+metrics/hbase/regionserver/ScanNext_num_ops: {
+ metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.ScanNext_num_ops,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/regionserver/Increment_num_ops: {
+ metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Increment_num_ops,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/regionserver/Append_num_ops: {
+ metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Append_num_ops,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/regionserver/ScanNext_95th_percentile: {
+ metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.ScanNext_95th_percentile,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/regionserver/Append_95th_percentile: {
+ metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Append_95th_percentile,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/regionserver/Increment_95th_percentile: {
+ metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Increment_95th_percentile,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/regionserver/updatesBlockedTime: {
+ metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.updatesBlockedTime,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/IPC/numActiveHandler: {
+ metric:
Hadoop:service=HBase,name=IPC,sub=IPC.numActiveHandler,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/IPC/numCallsInGeneralQueue: {
+ metric:
Hadoop:service=HBase,name=IPC,sub=IPC.numCallsInGeneralQueue,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/IPC/numOpenConnections: {
+ metric:
Hadoop:service=HBase,name=IPC,sub=IPC.numOpenConnections,
+ pointInTime: true,
+ temporal: false
+},
metrics/hbase/regionserver/slowAppendCount: {
metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.slowAppendCount,
pointInTime: true,
@@ -3023,6 +3073,56 @@
pointInTime: true,
temporal: false
},
+metrics/hbase/regionserver/ScanNext_num_ops: {
+ metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.ScanNext_num_ops,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/regionserver/Increment_num_ops: {
+ metric:
Hadoop:service=HBase,name=RegionServer,sub=Server.Increment_num_ops,
+ pointInTime: true,
+ temporal: false
+},
+metrics/hbase/regionserver/Append_num_ops: {
+ metric:
ambari git commit: AMBARI-11071 ambari agent is ignoring all env vars being set for the user when it runs commands (dsen)
Repository: ambari Updated Branches: refs/heads/trunk e7fdb7146 - 0b7f6a8f4 AMBARI-11071 ambari agent is ignoring all env vars being set for the user when it runs commands (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b7f6a8f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b7f6a8f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b7f6a8f Branch: refs/heads/trunk Commit: 0b7f6a8f404511e4ead5ed93e3a4c8f362090c24 Parents: e7fdb71 Author: Dmytro Sen d...@apache.org Authored: Wed May 13 10:24:49 2015 +0300 Committer: Dmytro Sen d...@apache.org Committed: Wed May 13 10:24:49 2015 +0300 -- ambari-agent/src/main/python/ambari_agent/PythonExecutor.py | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/0b7f6a8f/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py -- diff --git a/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py b/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py index 42e3861..3aa26a0 100644 --- a/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py +++ b/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py @@ -159,14 +159,11 @@ class PythonExecutor: to make possible unit testing close_fds = None if OSCheck.get_os_family() == OSConst.WINSRV_FAMILY else True - +command_env = dict(os.environ) if OSCheck.get_os_family() == OSConst.WINSRV_FAMILY: - command_env = dict(os.environ) command_env[PYTHONPATH] = os.pathsep.join(sys.path) for k, v in command_env.iteritems(): command_env[k] = str(v) -else: - command_env = None return subprocess.Popen(command, stdout=tmpout,
