ambari git commit: AMBARI-11712. Having wire encryption + NN HA enabled hdfs directories will fail to create (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 3bb8af2bb - 13225f9de
AMBARI-11712. Having wire encryption + NN HA enabled hdfs directories will fail
to create (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/13225f9d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/13225f9d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/13225f9d
Branch: refs/heads/trunk
Commit: 13225f9de5e1533c1aa399401499174ca6fedd84
Parents: 3bb8af2
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Jun 5 11:59:32 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Jun 5 11:59:32 2015 +0300
--
.../libraries/functions/namenode_ha_utils.py | 13 -
.../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 4 ++--
2 files changed, 10 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/13225f9d/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
index 0d9e28b..247d6e9 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
@@ -29,7 +29,7 @@ HDFS_NN_STATE_STANDBY = 'standby'
NAMENODE_HTTP_FRAGMENT = 'dfs.namenode.http-address.{0}.{1}'
NAMENODE_HTTPS_FRAGMENT = 'dfs.namenode.https-address.{0}.{1}'
-JMX_URI_FRAGMENT =
http://{0}/jmx?qry=Hadoop:service=NameNode,name=NameNodeStatus;
+JMX_URI_FRAGMENT =
{0}://{1}/jmx?qry=Hadoop:service=NameNode,name=NameNodeStatus
def get_namenode_states(hdfs_site, security_enabled, run_user):
@@ -47,18 +47,21 @@ def get_namenode_states(hdfs_site, security_enabled,
run_user):
# ie dfs.namenode.http-address.hacluster.nn1
nn_unique_ids = hdfs_site[nn_unique_ids_key].split(',')
for nn_unique_id in nn_unique_ids:
-is_https_enabled = hdfs_site['dfs.https.enabled'] if not
is_empty(hdfs_site['dfs.https.enabled']) else False
+is_https_enabled = hdfs_site['dfs.https.enable'] if not
is_empty(hdfs_site['dfs.https.enable']) else False
if not is_https_enabled:
key = NAMENODE_HTTP_FRAGMENT.format(name_service,nn_unique_id)
+ protocol = http
else:
- key = https://; +
NAMENODE_HTTPS_FRAGMENT.format(name_service,nn_unique_id)
-
+ key = NAMENODE_HTTPS_FRAGMENT.format(name_service,nn_unique_id)
+ protocol = https
+
if key in hdfs_site:
# use str() to ensure that unicode strings do not have the u' in them
value = str(hdfs_site[key])
- jmx_uri = JMX_URI_FRAGMENT.format(value)
+ jmx_uri = JMX_URI_FRAGMENT.format(protocol, value)
+
state = get_value_from_jmx(jmx_uri, 'State', security_enabled, run_user,
is_https_enabled)
if state == HDFS_NN_STATE_ACTIVE:
http://git-wip-us.apache.org/repos/asf/ambari/blob/13225f9d/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index c6b10b8..bc5a96b 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -385,8 +385,8 @@ policy_user =
config['configurations']['ranger-hdfs-plugin-properties']['policy_
jdk_location = config['hostLevelParams']['jdk_location']
java_share_dir = '/usr/share/java'
-is_https_enabled = config['configurations']['hdfs-site']['dfs.https.enabled']
if \
- not is_empty(config['configurations']['hdfs-site']['dfs.https.enabled'])
else False
+is_https_enabled = config['configurations']['hdfs-site']['dfs.https.enable']
if \
+ not is_empty(config['configurations']['hdfs-site']['dfs.https.enable']) else
False
if has_ranger_admin:
enable_ranger_hdfs =
(config['configurations']['ranger-hdfs-plugin-properties']['ranger-hdfs-plugin-enabled'].lower()
== 'yes')
ambari git commit: AMBARI-11695. Ambari RU should not perform 'yum install krb5-server' on ALL nodes during installing packages (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 13225f9de - 46c15e852
AMBARI-11695. Ambari RU should not perform 'yum install krb5-server' on ALL
nodes during installing packages (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/46c15e85
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/46c15e85
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/46c15e85
Branch: refs/heads/trunk
Commit: 46c15e852f5ca1b002423b8f6c3fcdf4d454c83a
Parents: 13225f9
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Jun 5 12:04:47 2015 +0300
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Jun 5 12:04:47 2015 +0300
--
.../ClusterStackVersionResourceProvider.java| 6 +-
.../HostStackVersionResourceProvider.java | 6 +-
.../ambari/server/state/ServiceOsSpecific.java | 30 -
.../AMBARI_METRICS/0.1.0/metainfo.xml | 7 +
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 4 +
.../HIVE/0.12.0.2.0/metainfo.xml| 4 +
.../KERBEROS/1.10.3-10/metainfo.xml | 10 ++
.../OOZIE/5.0.0.2.3/metainfo.xml| 1 +
.../SQOOP/1.4.4.2.0/metainfo.xml| 1 +
.../custom_actions/scripts/install_packages.py | 40 +-
.../BIGTOP/0.8/services/HDFS/metainfo.xml | 4 +
.../BIGTOP/0.8/services/HIVE/metainfo.xml | 4 +
.../BIGTOP/0.8/services/OOZIE/metainfo.xml | 1 +
.../2.0.6.GlusterFS/services/HIVE/metainfo.xml | 4 +
.../2.0.6.GlusterFS/services/OOZIE/metainfo.xml | 1 +
.../2.1.GlusterFS/services/HIVE/metainfo.xml| 4 +
.../2.1.GlusterFS/services/OOZIE/metainfo.xml | 1 +
.../stacks/HDP/2.1/services/HIVE/metainfo.xml | 4 +
.../stacks/HDP/2.2/services/HDFS/metainfo.xml | 4 +
.../stacks/HDP/2.2/services/HIVE/metainfo.xml | 4 +
.../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 1 +
.../2.3.GlusterFS/services/HDFS/metainfo.xml| 3 +
.../2.3.GlusterFS/services/HIVE/metainfo.xml| 4 +
.../2.3.GlusterFS/services/SQOOP/metainfo.xml | 1 +
.../stacks/HDP/2.3/services/HDFS/metainfo.xml | 3 +
.../stacks/HDP/2.3/services/HIVE/metainfo.xml | 4 +
.../stacks/HDP/2.3/services/SQOOP/metainfo.xml | 1 +
.../PHD/3.0.0.0/services/HDFS/metainfo.xml | 4 +
.../PHD/3.0.0.0/services/HIVE/metainfo.xml | 4 +
.../PHD/3.0.0.0/services/OOZIE/metainfo.xml | 1 +
...ClusterStackVersionResourceProviderTest.java | 10 +-
.../HostStackVersionResourceProviderTest.java | 12 +-
.../stack/StackManagerCommonServicesTest.java | 10 +-
.../custom_actions/TestInstallPackages.py | 135 +--
.../common-services/PIG/1.0/metainfo.xml| 5 +
35 files changed, 157 insertions(+), 181 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/46c15e85/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 6c8b733..03b98af 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -440,7 +440,11 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
ListServiceOsSpecific.Package packagesForService =
managementController.getPackagesForServiceHost(info,
new HashMapString, String(), // Contents are ignored
host.getOsFamily());
- packages.addAll(packagesForService);
+ for (ServiceOsSpecific.Package aPackage : packagesForService) {
+if (! aPackage.getSkipUpgrade()) {
+ packages.add(aPackage);
+}
+ }
}
final String packageList = gson.toJson(packages);
final String repoList = gson.toJson(repoInfo);
http://git-wip-us.apache.org/repos/asf/ambari/blob/46c15e85/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index 9e1c73a..a44be9a 100644
---
ambari git commit: AMBARI-11718. Enable Kerberos is available during Rolling Upgrade 2.2.x - 2.3 (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk ed3d49a59 - add8bf4b6
AMBARI-11718. Enable Kerberos is available during Rolling Upgrade 2.2.x - 2.3
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/add8bf4b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/add8bf4b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/add8bf4b
Branch: refs/heads/trunk
Commit: add8bf4b6dc4456e6abb87bcef12617a8038e9c0
Parents: ed3d49a
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Fri Jun 5 14:03:52 2015 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Fri Jun 5 14:04:16 2015 +0300
--
ambari-web/app/templates/main/admin/kerberos.hbs | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/add8bf4b/ambari-web/app/templates/main/admin/kerberos.hbs
--
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs
b/ambari-web/app/templates/main/admin/kerberos.hbs
index 7b86cb3..b191dc2 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -19,11 +19,13 @@
{{#if securityEnabled}}
div
p class=text-success{{t admin.security.enabled}}
-a class=btn btn-padding btn-warning admin-disable-security-btn
{{bindAttr disabled=isSubmitDisabled}} {{action notifySecurityOffPopup
target=controller}}{{t admin.kerberos.button.disable}} /a
-{{#unless isManualKerberos}}
- button class=btn btn-success{{action regenerateKeytabs
target=controller}}i class=icon-repeat/i {{t
admin.kerberos.button.regenerateKeytabs}}/button
-{{/unless}}
-br/
+{{#isAccessible ADMIN}}
+ a class=btn btn-padding btn-warning admin-disable-security-btn
{{bindAttr disabled=isSubmitDisabled}} {{action notifySecurityOffPopup
target=controller}}{{t admin.kerberos.button.disable}} /a
+ {{#unless isManualKerberos}}
+button class=btn btn-success{{action regenerateKeytabs
target=controller}}i class=icon-repeat/i {{t
admin.kerberos.button.regenerateKeytabs}}/button
+ {{/unless}}
+ br/
+{{/isAccessible}}
/p
/div
div id=serviceConfig
@@ -32,8 +34,10 @@
{{else}}
div
p class=muted{{t admin.security.disabled}}
-a class=btn btn-padding btn-success admin-enable-security-btn
{{action checkAndStartKerberosWizard target=controller}}{{t
admin.kerberos.button.enable}} /a
-br/
+{{#isAccessible ADMIN}}
+ a class=btn btn-padding btn-success admin-enable-security-btn
{{action checkAndStartKerberosWizard target=controller}}{{t
admin.kerberos.button.enable}} /a
+ br/
+{{/isAccessible}}
/p
/div
{{/if}}
[2/2] ambari git commit: AMBARI-11716 Gauge widget: when data is not available then display n/a. (atkach)
AMBARI-11716 Gauge widget: when data is not available then display n/a. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed3d49a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed3d49a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed3d49a5
Branch: refs/heads/trunk
Commit: ed3d49a59eb8ee51300882bd847ad79682fd5b5e
Parents: d622872
Author: Andrii Tkach atk...@hortonworks.com
Authored: Fri Jun 5 12:53:45 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Fri Jun 5 12:53:45 2015 +0300
--
ambari-web/app/styles/enhanced_service_dashboard.less | 3 +++
ambari-web/app/templates/common/widget/gauge_widget.hbs | 10 +-
ambari-web/app/views/common/widget/gauge_widget_view.js | 7 +++
3 files changed, 19 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed3d49a5/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less
b/ambari-web/app/styles/enhanced_service_dashboard.less
index 50c1292..bde2828 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -147,6 +147,9 @@
.frame;
.content {
padding-top: 40px;
+.unavailable {
+ padding-top: 30px;
+}
}
}
.red {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed3d49a5/ambari-web/app/templates/common/widget/gauge_widget.hbs
--
diff --git a/ambari-web/app/templates/common/widget/gauge_widget.hbs
b/ambari-web/app/templates/common/widget/gauge_widget.hbs
index 97c158d..9463c87 100644
--- a/ambari-web/app/templates/common/widget/gauge_widget.hbs
+++ b/ambari-web/app/templates/common/widget/gauge_widget.hbs
@@ -30,7 +30,15 @@
i class=icon-edit/i
/a
{{/isAccessible}}
-div class=content {{view view.chartView}}/div
+div class=content
+ {{#if view.isUnavailable}}
+div class=grey unavailable
+ {{t common.na}}
+/div
+ {{else}}
+{{view view.chartView}}
+ {{/if}}
+/div
{{#if view.content.description}}
div class=hidden-description
{{view.content.description}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed3d49a5/ambari-web/app/views/common/widget/gauge_widget_view.js
--
diff --git a/ambari-web/app/views/common/widget/gauge_widget_view.js
b/ambari-web/app/views/common/widget/gauge_widget_view.js
index acc8d4b..3d782cd 100644
--- a/ambari-web/app/views/common/widget/gauge_widget_view.js
+++ b/ambari-web/app/views/common/widget/gauge_widget_view.js
@@ -32,6 +32,13 @@ App.GaugeWidgetView = Em.View.extend(App.WidgetMixin, {
*/
metrics: [],
+ /**
+ * @type {boolean}
+ */
+ isUnavailable: function () {
+return isNaN(parseFloat(this.get('value')));
+ }.property('value'),
+
chartView: App.ChartPieView.extend({
stroke: '#D6DDDF', //light grey
innerR: 25,
[1/2] ambari git commit: AMBARI-11715 Alert instances page: prevent removing all records from model. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 46c15e852 - ed3d49a59
AMBARI-11715 Alert instances page: prevent removing all records from model.
(atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d6228723
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d6228723
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d6228723
Branch: refs/heads/trunk
Commit: d62287237b1a15b6b1852e242a46e43a1cfde6b0
Parents: 46c15e8
Author: Andrii Tkach atk...@hortonworks.com
Authored: Fri Jun 5 11:59:22 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Fri Jun 5 12:53:14 2015 +0300
--
.../main/alerts/alert_instances_controller.js | 2 +-
.../app/mappers/alert_instances_mapper.js | 58 ++--
.../test/mappers/alert_instances_mapper_test.js | 143 ++-
3 files changed, 56 insertions(+), 147 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d6228723/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
--
diff --git
a/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
b/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
index a55298f..391c326 100644
--- a/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
+++ b/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
@@ -169,7 +169,7 @@ App.MainAlertInstancesController = Em.Controller.extend({
* @method getAlertInstancesSuccessCallback
*/
getAlertInstancesSuccessCallback: function (json) {
-App.alertInstanceMapper.map(json, true);
+App.alertInstanceMapper.map(json);
this.set('isLoaded', true);
this.set('reload', !this.get('reload'));
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/d6228723/ambari-web/app/mappers/alert_instances_mapper.js
--
diff --git a/ambari-web/app/mappers/alert_instances_mapper.js
b/ambari-web/app/mappers/alert_instances_mapper.js
index 852ce71..eabc9f8 100644
--- a/ambari-web/app/mappers/alert_instances_mapper.js
+++ b/ambari-web/app/mappers/alert_instances_mapper.js
@@ -40,53 +40,23 @@ App.alertInstanceMapper = App.QuickDataMapper.create({
text: 'Alert.text'
},
- map: function(json, skipDelete) {
+ map: function(json) {
if (json.items) {
- var alertInstances = (skipDelete) ? this.mapWithoutDelete(json) :
this.mapAndDelete(json);
-
- App.store.loadMany(this.get('model'), alertInstances);
-}
- },
-
- /**
- * method that used when we not on alert definition state
- * in this case we need to delete alerts that is not critical and not warning
- * @param json
- * @returns {Array}
- */
- mapAndDelete: function(json) {
-var self = this,
- alertInstances = [],
- model = this.get('model'),
- alertsToDelete = model.find().mapProperty('id');
-
-json.items.forEach(function (item) {
- var alert = this.parseIt(item, this.get('config'));
- alertInstances.push(alert);
- alertsToDelete = alertsToDelete.without(alert.id);
-}, this);
+ var alertInstances = [];
+ var model = this.get('model');
+ var alertsToDelete = model.find().mapProperty('id');
+ json.items.forEach(function (item) {
+var alert = this.parseIt(item, this.get('config'));
+alertInstances.push(alert);
+alertsToDelete = alertsToDelete.without(alert.id);
+ }, this);
-alertsToDelete.forEach(function(alertId) {
- var item = model.find(alertId);
- self.deleteRecord(item);
-});
+ if (alertsToDelete.length 0) {
+model.find().clear();
+ }
-return alertInstances;
- },
-
- /**
- * this method is used on alert definition page
- * @param json
- * @returns {Array}
- */
- mapWithoutDelete: function(json) {
-var alertInstances = [];
-json.items.forEach(function (item) {
- var alert = this.parseIt(item, this.get('config'));
- alertInstances.push(alert);
-}, this);
-return alertInstances;
+ App.store.loadMany(this.get('model'), alertInstances);
+}
}
-
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/d6228723/ambari-web/test/mappers/alert_instances_mapper_test.js
--
diff --git a/ambari-web/test/mappers/alert_instances_mapper_test.js
b/ambari-web/test/mappers/alert_instances_mapper_test.js
index 1cdab7f..2432749 100644
--- a/ambari-web/test/mappers/alert_instances_mapper_test.js
+++ b/ambari-web/test/mappers/alert_instances_mapper_test.js
@@ -18,7 +18,6 @@
var App = require('app');
require('mappers/alert_instances_mapper');
-var testHelpers =
ambari git commit: AMBARI-11697. Automatic RM URL Config (Erik Bergenholtz via rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk add8bf4b6 - 7d793c2b3
AMBARI-11697. Automatic RM URL Config (Erik Bergenholtz via rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d793c2b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d793c2b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d793c2b
Branch: refs/heads/trunk
Commit: 7d793c2b33730184e8ba8cb6d8dfd6589578e21d
Parents: add8bf4
Author: Erik Bergenholtz ebergenho...@hortonworks.com
Authored: Fri Jun 5 07:12:24 2015 -0400
Committer: Robert Levas rle...@hortonworks.com
Committed: Fri Jun 5 07:12:30 2015 -0400
--
contrib/views/capacity-scheduler/pom.xml| 8 +-
.../capacityscheduler/ConfigurationService.java | 19 +--
.../capacityscheduler/PropertyValidator.java| 12 +-
.../src/main/resources/ui/app/adapters.js | 11 +-
.../main/resources/ui/app/assets/data/all.json | 4 +
.../ui/app/components/capacityInput.js | 7 +-
.../resources/ui/app/components/pathInput.js| 28 ++--
.../resources/ui/app/components/queueBadge.js | 12 ++
.../ui/app/components/totalCapacity.js | 4 +-
.../main/resources/ui/app/controllers/queue.js | 2 +-
.../main/resources/ui/app/controllers/queues.js | 45 ++-
.../main/resources/ui/app/helpers/timeAgo.js| 2 +-
.../src/main/resources/ui/app/models/queue.js | 12 +-
.../src/main/resources/ui/app/serializers.js| 16 ++-
.../src/main/resources/ui/app/store.js | 28 +++-
.../resources/ui/app/styles/application.less| 3 +-
.../app/templates/components/queueContainer.hbs | 6 +-
.../app/templates/components/queueListItem.hbs | 4 +
.../app/templates/components/userGroupInput.hbs | 4 +-
.../ui/app/templates/schedulerPanel.hbs | 63 +
.../src/main/resources/ui/config.coffee | 2 +-
.../ui/test/unit/controllers/queue_test.js | 51
.../src/main/resources/view.xml | 4 +-
.../PropertyValidatorTest.java | 131 +++
contrib/views/utils/pom.xml | 7 +-
.../apache/ambari/view/utils/ViewUserLocal.java | 116
.../ambari/view/utils/ambari/AmbariApi.java | 14 +-
.../ambari/view/utils/ambari/Services.java | 131 +++
.../view/utils/hdfs/ConfigurationBuilder.java | 32 -
.../apache/ambari/view/utils/hdfs/HdfsApi.java | 15 ++-
.../apache/ambari/view/utils/hdfs/HdfsUtil.java | 5 +-
.../ambari/view/utils/ViewUserLocalTest.java| 98 ++
.../utils/hdfs/ConfigurationBuilderTest.java| 2 -
33 files changed, 813 insertions(+), 85 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d793c2b/contrib/views/capacity-scheduler/pom.xml
--
diff --git a/contrib/views/capacity-scheduler/pom.xml
b/contrib/views/capacity-scheduler/pom.xml
index 23e5aee..fb71094 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -19,7 +19,7 @@
modelVersion4.0.0/modelVersion
groupIdorg.apache.ambari.contrib.views/groupId
artifactIdcapacity-scheduler/artifactId
-version0.4.0-SNAPSHOT/version
+version1.0.0-SNAPSHOT/version
nameCapacity Scheduler/name
parent
@@ -72,6 +72,12 @@
artifactIdambari-views-utils/artifactId
version0.0.1-SNAPSHOT/version
/dependency
+dependency
+groupIdorg.easymock/groupId
+artifactIdeasymock/artifactId
+version3.2/version
+scopetest/scope
+/dependency
/dependencies
properties
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d793c2b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java
--
diff --git
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java
index b192543..c3e415a 100644
---
a/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java
+++
b/contrib/views/capacity-scheduler/src/main/java/org/apache/ambari/view/capacityscheduler/ConfigurationService.java
@@ -98,9 +98,8 @@ public class ConfigurationService {
private static final String VERSION_TAG_URL =
?fields=Clusters/desired_configs/capacity-scheduler;
private static final String CONFIGURATION_URL =
configurations?type=capacity-scheduler;
private static final String CONFIGURATION_URL_BY_TAG =
ambari git commit: AMBARI-11685. AMBARI-11685 : YARN repo in Ranger Admin neds to have the right value for YARN REST URL (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 7d793c2b3 - 615c2d698
AMBARI-11685. AMBARI-11685 : YARN repo in Ranger Admin neds to have the right
value for YARN REST URL (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/615c2d69
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/615c2d69
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/615c2d69
Branch: refs/heads/trunk
Commit: 615c2d6984b5283250a2a2e09fc459c8aea2d93c
Parents: 7d793c2
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Jun 5 15:18:58 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Jun 5 15:18:58 2015 +0300
--
.../configuration/ranger-kms-audit.xml | 6 ++---
.../2.1.0.2.0/package/scripts/params_linux.py | 7 -
.../ranger-hdfs-plugin-properties.xml | 2 +-
.../HBASE/configuration/ranger-hbase-audit.xml | 1 +
.../ranger-hbase-policymgr-ssl.xml | 2 ++
.../HDFS/configuration/ranger-hdfs-audit.xml| 1 +
.../configuration/ranger-hdfs-policymgr-ssl.xml | 2 ++
.../HIVE/configuration/ranger-hive-audit.xml| 1 +
.../configuration/ranger-hive-policymgr-ssl.xml | 2 ++
.../KAFKA/configuration/ranger-kafka-audit.xml | 1 +
.../ranger-kafka-plugin-properties.xml | 4 +--
.../ranger-kafka-policymgr-ssl.xml | 2 ++
.../KNOX/configuration/ranger-knox-audit.xml| 1 +
.../configuration/ranger-knox-policymgr-ssl.xml | 2 ++
.../RANGER/configuration/ranger-admin-site.xml | 8 +++---
.../STORM/configuration/ranger-storm-audit.xml | 1 +
.../ranger-storm-policymgr-ssl.xml | 2 ++
.../YARN/configuration/ranger-yarn-audit.xml| 1 +
.../ranger-yarn-plugin-properties.xml | 2 +-
.../configuration/ranger-yarn-policymgr-ssl.xml | 2 ++
ambari-web/app/data/HDP2.2/site_properties.js | 9 +++
ambari-web/app/data/HDP2.3/site_properties.js | 27
22 files changed, 75 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
index 661f818..e5bd75e 100644
---
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
+++
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
@@ -64,7 +64,7 @@
property
namexasecure.audit.destination.db.batch.filespool.dir/name
-value/var/log/kms/audit/db/spool/value
+value/var/log/ranger/kms/audit/db/spool/value
description/description
/property
@@ -82,7 +82,7 @@
property
namexasecure.audit.destination.hdfs.batch.filespool.dir/name
-value/var/log/kms/audit/hdfs/spool/value
+value/var/log/ranger/kms/audit/hdfs/spool/value
description/description
/property
@@ -106,7 +106,7 @@
property
namexasecure.audit.destination.solr.batch.filespool.dir/name
-value/var/log/kms/audit/solr/spool/value
+value/var/log/ranger/kms/audit/solr/spool/value
description/description
/property
http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index f2ccaf3..35cfef4 100644
---
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -298,11 +298,16 @@ if has_ranger_admin:
ranger_env = config['configurations']['ranger-env']
ranger_plugin_properties =
config['configurations']['ranger-yarn-plugin-properties']
policy_user =
config['configurations']['ranger-yarn-plugin-properties']['policy_user']
+yarn_rest_url =
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address']
+yarn_http_policy =
config['configurations']['yarn-site']['yarn.http.policy']
+scheme = 'http'
+if yarn_http_policy.upper() == 'HTTPS_ONLY':
+ scheme = 'https'
ranger_plugin_config = {
'username' :
ambari git commit: AMBARI-11702 Enhanced Dashboard: Server Error on toggling add widget (additional patch) (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 615c2d698 - ea7485ae5
AMBARI-11702 Enhanced Dashboard: Server Error on toggling add widget
(additional patch) (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea7485ae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea7485ae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea7485ae
Branch: refs/heads/trunk
Commit: ea7485ae568d533d7aea9f31de8a96846d0d5a8c
Parents: 615c2d6
Author: Dmytro Sen d...@apache.org
Authored: Fri Jun 5 15:50:53 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Fri Jun 5 15:50:53 2015 +0300
--
.../controller/internal/WidgetLayoutResourceProviderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea7485ae/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
index 8184d34..2f05402 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
@@ -268,7 +268,7 @@ public class WidgetLayoutResourceProviderTest {
resetToStrict(dao, widgetDAO);
expect(dao.findById(1L)).andReturn(entity).anyTimes();
-expect(dao.merge((WidgetLayoutEntity)
anyObject())).andReturn(entity).anyTimes();
+expect(dao.mergeWithFlush((WidgetLayoutEntity)
anyObject())).andReturn(entity).anyTimes();
expect(widgetDAO.merge(widgetEntity)).andReturn(widgetEntity).anyTimes();
expect(widgetDAO.findById(2L)).andReturn(widgetEntity2).anyTimes();
replay(dao, widgetDAO);
ambari git commit: AMBARI-11721. Handle if non-default value is used for hbase.tmp.dir (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk ea7485ae5 - fb90a26e8
AMBARI-11721. Handle if non-default value is used for hbase.tmp.dir (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb90a26e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb90a26e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb90a26e
Branch: refs/heads/trunk
Commit: fb90a26e82a58c9b72d506786fbdb6decc759dff
Parents: ea7485a
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Jun 5 16:50:32 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Jun 5 16:50:32 2015 +0300
--
.../0.96.0.2.0/configuration/hbase-site.xml | 2 +-
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 17 +---
.../0.96.0.2.0/package/scripts/params_linux.py | 3 +-
.../stacks/2.0.6/HBASE/test_hbase_client.py | 26 +
.../stacks/2.0.6/HBASE/test_hbase_master.py | 39 ++-
.../2.0.6/HBASE/test_hbase_regionserver.py | 41 ++--
.../2.0.6/HBASE/test_phoenix_queryserver.py | 26 +
.../python/stacks/2.0.6/configs/default.json| 2 +-
.../python/stacks/2.0.6/configs/hbase-2.2.json | 2 +-
.../stacks/2.0.6/configs/hbase-check-2.2.json | 4 +-
.../stacks/2.0.6/configs/hbase-preupgrade.json | 2 +-
.../stacks/2.0.6/configs/hbase-rs-2.2.json | 2 +-
.../python/stacks/2.0.6/configs/secured.json| 2 +-
.../stacks/2.3/configs/hbase_default.json | 2 +-
.../python/stacks/2.3/configs/hbase_secure.json | 2 +-
15 files changed, 25 insertions(+), 147 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
index 65f72a7..1cad600 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
@@ -49,7 +49,7 @@
/property
property
namehbase.tmp.dir/name
-value/tmp/hbase-${user.name}/value
+value/tmp/hbase-{{hbase_user}}/value
descriptionTemporary directory on the local filesystem.
Change this setting to point to a location more permanent
than '/tmp' (The '/tmp' directory is often cleared on
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
index 1bfa7e4..0478398 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
@@ -56,27 +56,14 @@ def hbase(name=None):
recursive = True
)
- Directory (params.tmp_dir,
+ Directory (InlineTemplate(params.hbase_tmp_dir).get_content()+/local/jars,
owner = params.hbase_user,
+ group = params.user_group,
mode=0775,
recursive = True,
cd_access=a,
)
- Directory (params.local_dir,
- owner = params.hbase_user,
- group = params.user_group,
- mode=0775,
- recursive = True
- )
-
- Directory (os.path.join(params.local_dir, jars),
- owner = params.hbase_user,
- group = params.user_group,
- mode=0775,
- recursive = True
- )
-
XmlConfig( hbase-site.xml,
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hbase-site'],
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb90a26e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index e8585cd..d25eac8 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
ambari git commit: AMBARI-11723 Configs: comparing versions does not show new props after Ambari Upgrade. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk fb90a26e8 - a22f819d4
AMBARI-11723 Configs: comparing versions does not show new props after Ambari
Upgrade. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a22f819d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a22f819d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a22f819d
Branch: refs/heads/trunk
Commit: a22f819d4673d8187b61f41bbaa2388997b0eda6
Parents: fb90a26
Author: Andrii Tkach atk...@hortonworks.com
Authored: Fri Jun 5 16:26:05 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Fri Jun 5 17:18:44 2015 +0300
--
ambari-web/app/controllers/main/service/info/configs.js | 4 +++-
.../test/controllers/main/service/info/config_test.js| 11 ---
2 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a22f819d/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 f809c64..5c3a27c 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -677,6 +677,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
*/
setCompareDefaultGroupConfig: function (serviceConfig, compareConfig) {
var compareObject = {};
+var isEmptyProp = App.isEmptyObject(serviceConfig);
serviceConfig.compareConfigs = [];
serviceConfig.isComparison = true;
@@ -686,7 +687,8 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
compareObject = this.getComparisonConfig(serviceConfig, compareConfig);
serviceConfig.hasCompareDiffs = serviceConfig.isMock ||
this.hasCompareDiffs(serviceConfig, compareObject);
serviceConfig.compareConfigs.push(compareObject);
-} else if (serviceConfig.isUserProperty) {
+// user custom property or property that was added during upgrade
+} else if (serviceConfig.isUserProperty || (!isEmptyProp !compareConfig
Em.get(serviceConfig, 'isRequiredByAgent') !== false)) {
serviceConfig.compareConfigs.push(this.getMockComparisonConfig(serviceConfig,
this.get('compareServiceVersion.version')));
serviceConfig.hasCompareDiffs = true;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a22f819d/ambari-web/test/controllers/main/service/info/config_test.js
--
diff --git a/ambari-web/test/controllers/main/service/info/config_test.js
b/ambari-web/test/controllers/main/service/info/config_test.js
index defdaf0..df62723 100644
--- a/ambari-web/test/controllers/main/service/info/config_test.js
+++ b/ambari-web/test/controllers/main/service/info/config_test.js
@@ -946,10 +946,10 @@ describe(App.MainServiceInfoConfigsController, function
() {
mainServiceInfoConfigsController.getMockComparisonConfig.restore();
mainServiceInfoConfigsController.hasCompareDiffs.restore();
});
-it(expect that setCompareDefaultGroupConfig will not run anything,
function() {
+it(empty service config passed, expect that setCompareDefaultGroupConfig
will not run anything, function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({}).compareConfigs.length).to.equal(0);
});
-it(expect that setCompareDefaultGroupConfig will not run anything,
function() {
+it(empty service config and comparison passed, expect that
setCompareDefaultGroupConfig will not run anything, function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({},{}).compareConfigs.length).to.equal(0);
});
it(expect that serviceConfig.compareConfigs will be
getMockComparisonConfig, function() {
@@ -964,7 +964,12 @@ describe(App.MainServiceInfoConfigsController, function
() {
it(expect that serviceConfig.compareConfigs will be getComparisonConfig,
function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({isReconfigurable:
true, isMock: true}, {})).to.eql({compareConfigs: [compConfig],
isReconfigurable: true, isMock: true, isComparison: true, hasCompareDiffs:
true});
});
-
+it(property was created during upgrade and have no comparison, compare
with 'Undefined' value should be created, function() {
+
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({name:
'prop1', isUserProperty: false}, null)).to.eql({
+name: 'prop1', isUserProperty: false, compareConfigs: [mockConfig],
+isComparison: true, hasCompareDiffs: true
+ });
+
ambari git commit: AMBARI-11727 Perf: Set appropriate ulimit values for Metrics Hbase Master and Collector processes (dsen)
Repository: ambari Updated Branches: refs/heads/trunk 4b2ca8066 - d1ccd2843 AMBARI-11727 Perf: Set appropriate ulimit values for Metrics Hbase Master and Collector processes (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d1ccd284 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d1ccd284 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d1ccd284 Branch: refs/heads/trunk Commit: d1ccd284380c2bd32459dc5310f340ae1fe92817 Parents: 4b2ca80 Author: Dmytro Sen d...@apache.org Authored: Fri Jun 5 20:25:06 2015 +0300 Committer: Dmytro Sen d...@apache.org Committed: Fri Jun 5 20:25:06 2015 +0300 -- .../0.1.0/configuration/ams-hbase-env.xml | 7 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 15 + .../0.1.0/package/scripts/params.py | 2 ++ .../0.1.0/package/scripts/params_linux.py | 2 ++ .../0.1.0/package/templates/ams.conf.j2 | 35 5 files changed, 61 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d1ccd284/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml index 1734ac4..6325a50 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml @@ -69,6 +69,13 @@ sum of master and regionserver heap sizes. /description /property + property +namemax_open_files_limit/name +value32768/value +description +The maximum number of open file descriptors by process +/description + /property !-- hbase-env.sh -- property http://git-wip-us.apache.org/repos/asf/ambari/blob/d1ccd284/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py index fc18042..b08e705 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py @@ -245,6 +245,21 @@ def ams(name=None): mode=0755 ) +# On some OS this folder could be not exists, so we will create it before pushing there files +Directory(params.limits_conf_dir, + recursive=True, + owner='root', + group='root' +) + +# Setting up security limits +File(os.path.join(params.limits_conf_dir, 'ams.conf'), + owner='root', + group='root', + mode=0644, + content=Template(ams.conf.j2) +) + # Phoenix spool file dir if not /tmp if not os.path.exists(params.phoenix_client_spool_dir): Directory(params.phoenix_client_spool_dir, http://git-wip-us.apache.org/repos/asf/ambari/blob/d1ccd284/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py index 47fd2dd..4c78f77 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py @@ -110,6 +110,8 @@ if not is_hbase_distributed: else: hbase_heapsize = master_heapsize +max_open_files_limit = default(/configurations/ams-hbase-env/max_open_files_limit, 32768) + zookeeper_quorum_hosts = ','.join(ams_collector_hosts) if is_hbase_distributed else 'localhost' ams_checkpoint_dir = config['configurations']['ams-site']['timeline.metrics.aggregator.checkpoint.dir'] http://git-wip-us.apache.org/repos/asf/ambari/blob/d1ccd284/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
ambari git commit: AMBARI-11731. Ambari Metrics Service Check fails on SUSE. (swagle)
Repository: ambari Updated Branches: refs/heads/trunk d1ccd2843 - 975cf26ab AMBARI-11731. Ambari Metrics Service Check fails on SUSE. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/975cf26a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/975cf26a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/975cf26a Branch: refs/heads/trunk Commit: 975cf26ab2087fd4f5046928fdf68a2a8ffab9cb Parents: d1ccd28 Author: Siddharth Wagle swa...@hortonworks.com Authored: Fri Jun 5 10:38:24 2015 -0700 Committer: Siddharth Wagle swa...@hortonworks.com Committed: Fri Jun 5 10:38:43 2015 -0700 -- ambari-metrics/pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/975cf26a/ambari-metrics/pom.xml -- diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml index e57d2a2..782664a 100644 --- a/ambari-metrics/pom.xml +++ b/ambari-metrics/pom.xml @@ -38,9 +38,7 @@ !--TODO change to HDP URL-- hbase.tarhttp://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hbase-0.98.4.2.2.0.0-2041-hadoop2.tar.gz/hbase.tar hbase.folderhbase-0.98.4.2.2.0.0-2041-hadoop2/hbase.folder -hadoop.tar - http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hadoop-2.6.0.2.2.0.0-2041.tar.gz -/hadoop.tar + hadoop.tarhttp://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hadoop-2.6.0.2.2.0.0-2041.tar.gz/hadoop.tar hadoop.folderhadoop-2.6.0.2.2.0.0-2041/hadoop.folder hbase.winpkg.zipfile:///c:/hbase_embedded/hbase-0.98.4.2.2.0.0-2041-hadoop2.winpkg.zip/hbase.winpkg.zip hadoop.winpkg.zipfile:///c:/hbase_embedded/hadoop-2.6.0.2.2.0.0-2041.winpkg.zip/hadoop.winpkg.zip
ambari git commit: AMBARI-11731. Ambari Metrics Service Check fails on SUSE. (swagle)
Repository: ambari Updated Branches: refs/heads/branch-2.1 3004eee05 - 4a825b8bc AMBARI-11731. Ambari Metrics Service Check fails on SUSE. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a825b8b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a825b8b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a825b8b Branch: refs/heads/branch-2.1 Commit: 4a825b8bc5235fa71fabff388d7306df5c984654 Parents: 3004eee Author: Siddharth Wagle swa...@hortonworks.com Authored: Fri Jun 5 11:31:26 2015 -0700 Committer: Siddharth Wagle swa...@hortonworks.com Committed: Fri Jun 5 11:31:26 2015 -0700 -- ambari-metrics/pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4a825b8b/ambari-metrics/pom.xml -- diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml index b7be295..2a26d58 100644 --- a/ambari-metrics/pom.xml +++ b/ambari-metrics/pom.xml @@ -38,9 +38,7 @@ !--TODO change to HDP URL-- hbase.tarhttp://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hbase-0.98.4.2.2.0.0-2041-hadoop2.tar.gz/hbase.tar hbase.folderhbase-0.98.4.2.2.0.0-2041-hadoop2/hbase.folder -hadoop.tar - http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hadoop-2.6.0.2.2.0.0-2041.tar.gz -/hadoop.tar + hadoop.tarhttp://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hadoop-2.6.0.2.2.0.0-2041.tar.gz/hadoop.tar hadoop.folderhadoop-2.6.0.2.2.0.0-2041/hadoop.folder hbase.winpkg.zipfile:///c:/hbase_embedded/hbase-0.98.4.2.2.0.0-2041-hadoop2.winpkg.zip/hbase.winpkg.zip hadoop.winpkg.zipfile:///c:/hbase_embedded/hadoop-2.6.0.2.2.0.0-2041.winpkg.zip/hadoop.winpkg.zip
ambari git commit: AMBARI-11733. Dashboard: nameNode RPC widget is n/a. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 12fd6d8cd - c7b0688a4
AMBARI-11733. Dashboard: nameNode RPC widget is n/a. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c7b0688a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7b0688a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7b0688a
Branch: refs/heads/trunk
Commit: c7b0688a400e56c51a53b3f335cda3fbe1f9386d
Parents: 12fd6d8
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Fri Jun 5 12:14:37 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Fri Jun 5 12:15:59 2015 -0700
--
.../common-services/HDFS/2.1.0.2.0/metrics.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c7b0688a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
index 4cf93d5..b1e95fe 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
@@ -1710,7 +1710,7 @@
temporal: false
},
metrics/rpc/NumOpenConnections: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.NumOpenConnections,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.NumOpenConnections,
pointInTime: true,
temporal: false
},
@@ -1921,12 +1921,12 @@
temporal: false
},
metrics/rpc/RpcQueueTimeAvgTime: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.RpcQueueTimeAvgTime,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.RpcQueueTimeAvgTime,
pointInTime: true,
temporal: false
},
metrics/rpc/RpcProcessingTimeAvgTime: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.RpcProcessingTimeAvgTime,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.RpcProcessingTimeAvgTime,
pointInTime: true,
temporal: false
},
@@ -3449,7 +3449,7 @@
temporal: false
},
metrics/rpc/RpcProcessingTime_avg_time: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.RpcProcessingTimeAvgTime,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.RpcProcessingTimeAvgTime,
pointInTime: true,
temporal: false
},
@@ -3534,7 +3534,7 @@
temporal: false
},
metrics/rpc/RpcQueueTime_avg_time: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.RpcQueueTimeAvgTime,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.RpcQueueTimeAvgTime,
pointInTime: true,
temporal: false
},
@@ -3604,7 +3604,7 @@
temporal: false
},
metrics/rpc/NumOpenConnections: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.NumOpenConnections,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.NumOpenConnections,
pointInTime: true,
temporal: false
},
ambari git commit: AMBARI-11711. Dashboard: graph descriptions are not very visible on service dashboard page.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 4a825b8bc - b292893e1
AMBARI-11711. Dashboard: graph descriptions are not very visible on service
dashboard page.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b292893e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b292893e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b292893e
Branch: refs/heads/branch-2.1
Commit: b292893e125994d5000540b69b42371027df7f76
Parents: 4a825b8
Author: Xi Wang xiw...@apache.org
Authored: Thu Jun 4 17:52:02 2015 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Fri Jun 5 11:42:05 2015 -0700
--
.../app/styles/enhanced_service_dashboard.less | 22
.../app/templates/main/charts/linear_time.hbs | 6 --
.../app/views/common/chart/linear_time.js | 3 ++-
ambari-web/vendor/scripts/rickshaw.js | 18
4 files changed, 42 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b292893e/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less
b/ambari-web/app/styles/enhanced_service_dashboard.less
index bde2828..0ff9c88 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -237,6 +237,28 @@
background: rgba(255,255,255, 0.7);
}
}
+ .thumbnail .chart-legend ul {
+max-width: 300px;
+.description-line {
+ padding: 3px 3px 8px 8px;
+ line-height: 16px;
+ max-height: 43px;
+ font-weight: bold;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ overflow: scroll;
+}
+ }
+}
+
+.chart-legend .description-line {
+ padding: 0px 3px 8px 8px;
+ line-height: 16px;
+ max-height: 45px;
+ font-weight: bold;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ overflow: scroll;
}
#edit-widget-wizard,
http://git-wip-us.apache.org/repos/asf/ambari/blob/b292893e/ambari-web/app/templates/main/charts/linear_time.hbs
--
diff --git a/ambari-web/app/templates/main/charts/linear_time.hbs
b/ambari-web/app/templates/main/charts/linear_time.hbs
index b6bd6d0..24c13e9 100644
--- a/ambari-web/app/templates/main/charts/linear_time.hbs
+++ b/ambari-web/app/templates/main/charts/linear_time.hbs
@@ -30,9 +30,3 @@
{{/unless}}
/div
-{{#if view.description}}
- div class=hidden-description {{action showGraphInPopup target=view}}
-{{view.description}}
- /div
-{{/if}}
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/b292893e/ambari-web/app/views/common/chart/linear_time.js
--
diff --git a/ambari-web/app/views/common/chart/linear_time.js
b/ambari-web/app/views/common/chart/linear_time.js
index dbffe4b..7737700 100644
--- a/ambari-web/app/views/common/chart/linear_time.js
+++ b/ambari-web/app/views/common/chart/linear_time.js
@@ -593,7 +593,8 @@ App.ChartLinearTimeView = Ember.View.extend({
var legend = new Rickshaw.Graph.Legend({
graph: _graph,
- element: legendElement
+ element: legendElement,
+ description: self.get('description')
});
new Rickshaw.Graph.Behavior.Series.Toggle({
http://git-wip-us.apache.org/repos/asf/ambari/blob/b292893e/ambari-web/vendor/scripts/rickshaw.js
--
diff --git a/ambari-web/vendor/scripts/rickshaw.js
b/ambari-web/vendor/scripts/rickshaw.js
index 6beb828..8be0f97 100644
--- a/ambari-web/vendor/scripts/rickshaw.js
+++ b/ambari-web/vendor/scripts/rickshaw.js
@@ -1445,6 +1445,7 @@ Rickshaw.Graph.Behavior.Series.Toggle = function(args) {
var self = this;
this.addAnchor = function(line) {
+if (line.noAnchor) return;
var anchor = document.createElement('a');
anchor.innerHTML = '#10004;';
anchor.classList.add('action');
@@ -1830,6 +1831,23 @@ Rickshaw.Graph.Legend = function(args) {
self.lines.push(_line);
};
+ this.addDescription = function (description) {
+if (!description) return;
+var line = document.createElement('div');
+line.className = 'description-line';
+
+var label = document.createElement('span');
+label.innerHTML = description;
+
+line.appendChild(label);
+list.appendChild(line);
+
+var _line = { element: line, noAnchor: true};
+self.lines.push(_line);
+ };
+
+ self.addDescription(args.description);
+
series.forEach( function(s) {
self.addLine(s);
} );
ambari git commit: AMBARI-11714: [WinTP2] Address build issues on Windows (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk e881532da - 6b382fc70
AMBARI-11714: [WinTP2] Address build issues on Windows (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b382fc7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b382fc7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b382fc7
Branch: refs/heads/trunk
Commit: 6b382fc709e843bf4247dca94fb61c304c60ae72
Parents: e881532
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Fri Jun 5 12:05:40 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Fri Jun 5 12:05:40 2015 -0700
--
ambari-metrics/pom.xml | 2 +-
ambari-web/set-ambari-version.cmd | 2 +-
ambari-web/set-default-stack-version.cmd| 2 +-
ambari-web/toggle-experimental.cmd | 2 +-
contrib/views/capacity-scheduler/pom.xml| 16
.../src/main/resources/ui/package.json | 3 +--
contrib/views/files/pom.xml | 16
.../views/files/src/main/resources/ui/package.json | 3 +--
contrib/views/pig/pom.xml | 16
.../pig/src/main/resources/ui/pig-web/package.json | 3 +--
10 files changed, 55 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 782664a..106f79b 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -154,7 +154,7 @@
namepackage-release/name
value${project.version}/value
regex
-^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)(([0-9]+)|(SNAPSHOT)).*
+
^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
/regex
replacement$5/replacement
failIfNoMatchtrue/failIfNoMatch
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/ambari-web/set-ambari-version.cmd
--
diff --git a/ambari-web/set-ambari-version.cmd
b/ambari-web/set-ambari-version.cmd
index 14fdec6..2b827fc 100644
--- a/ambari-web/set-ambari-version.cmd
+++ b/ambari-web/set-ambari-version.cmd
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File set-ambari-version.ps1 %*
\ No newline at end of file
+powershell -File set-ambari-version.ps1 %* NUL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/ambari-web/set-default-stack-version.cmd
--
diff --git a/ambari-web/set-default-stack-version.cmd
b/ambari-web/set-default-stack-version.cmd
index e724e1f..9f8a252 100644
--- a/ambari-web/set-default-stack-version.cmd
+++ b/ambari-web/set-default-stack-version.cmd
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File set-default-stack-version.ps1 %*
\ No newline at end of file
+powershell -File set-default-stack-version.ps1 %* NUL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/ambari-web/toggle-experimental.cmd
--
diff --git a/ambari-web/toggle-experimental.cmd
b/ambari-web/toggle-experimental.cmd
index 9552279..6cda98e 100644
--- a/ambari-web/toggle-experimental.cmd
+++ b/ambari-web/toggle-experimental.cmd
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File toggle-experimental.ps1 %*
\ No newline at end of file
+powershell -File toggle-experimental.ps1 %* NUL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b382fc7/contrib/views/capacity-scheduler/pom.xml
--
diff --git a/contrib/views/capacity-scheduler/pom.xml
b/contrib/views/capacity-scheduler/pom.xml
index fb71094..d3f11e3 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -161,6 +161,22 @@
/configuration
/execution
execution
+idBower install/id
+
ambari git commit: AMBARI-11725. Tez UI: Bookmarking capabilities are broken. (Sreenath Somarajapuram via yusaku)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 b292893e1 - 007ab5db6
AMBARI-11725. Tez UI: Bookmarking capabilities are broken. (Sreenath
Somarajapuram via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/007ab5db
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/007ab5db
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/007ab5db
Branch: refs/heads/branch-2.1
Commit: 007ab5db6f69827a5eaedf7ed685b94d4203b35e
Parents: b292893
Author: Yusaku Sako yus...@hortonworks.com
Authored: Fri Jun 5 12:12:31 2015 -0700
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Fri Jun 5 12:13:33 2015 -0700
--
.../resources/ui/scripts/init-ambari-view.js| 33 +---
1 file changed, 22 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/007ab5db/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
--
diff --git
a/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
b/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
index 12e0da6..615c727 100644
--- a/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
+++ b/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
@@ -72,6 +72,11 @@ function getQueryString(object) {
function redirectionCheck() {
var href = window.location.href;
+ // Ember expects the url to have /#/
+ if(href.indexOf('?') != -1 href.indexOf('/#/') == -1) {
+href = href.replace('?', '/#/?');
+ }
+
// If opened outside ambari, redirect
if(window.parent == window) {
var hrefParts = href.split('/#/'),
@@ -82,11 +87,17 @@ function redirectionCheck() {
queryParams[PATH_PARAM_NAME] = '/#/' + pathParts[0];
}
-window.location = '%@?%@'.fmt(
+href = '%@?%@'.fmt(
hrefParts[0].replace('/views/', '/#/main/views/'),
getQueryString(queryParams)
);
+ }
+ // Normalize href
+ href = href.replace(/\/\//g, '/').replace(':/', '://');
+
+ if(href != window.location.href) {
+window.location = href;
return true;
}
}
@@ -213,18 +224,15 @@ function loadParams() {
}
function onPathChange() {
-
var path = window.location.hash.substr(2).trim(),
pathParts = path.split('?'),
parentUrlParts = window.parent.location.href.split('?'),
- parentQueryParam = getQueryObject(parentUrlParts[1]);
+ parentQueryParam = getQueryObject(pathParts[1]);
- $.extend(parentQueryParam, getQueryObject(pathParts[1]));
- delete parentQueryParam[PATH_PARAM_NAME];
- if(pathParts[0]) {
-parentQueryParam[PATH_PARAM_NAME] = '/#/' + pathParts[0];
- }
+ if(pathParts[0]) {
+parentQueryParam[PATH_PARAM_NAME] = '/#/' + pathParts[0];
+ }
path = getQueryString(parentQueryParam);
window.parent.history.replaceState(
@@ -234,12 +242,15 @@ function onPathChange() {
);
}
+function scheduleChangeHandler(arguments) {
+ setTimeout(onPathChange, 100);
+}
+
if(!redirectionCheck()) {
App.ApplicationRoute.reopen({
actions: {
- didTransition: function (arguments) {
-setTimeout(onPathChange, 100);
- }
+ didTransition: scheduleChangeHandler,
+ queryParamsDidChange: scheduleChangeHandler
}
});
ambari git commit: AMBARI-11725. Tez UI: Bookmarking capabilities are broken. (Sreenath Somarajapuram via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 6b382fc70 - 12fd6d8cd
AMBARI-11725. Tez UI: Bookmarking capabilities are broken. (Sreenath
Somarajapuram via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12fd6d8c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12fd6d8c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12fd6d8c
Branch: refs/heads/trunk
Commit: 12fd6d8cdcc2235d3ff581928afcc26ed7941411
Parents: 6b382fc
Author: Yusaku Sako yus...@hortonworks.com
Authored: Fri Jun 5 12:12:31 2015 -0700
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Fri Jun 5 12:12:31 2015 -0700
--
.../resources/ui/scripts/init-ambari-view.js| 33 +---
1 file changed, 22 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/12fd6d8c/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
--
diff --git
a/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
b/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
index 12e0da6..615c727 100644
--- a/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
+++ b/contrib/views/tez/src/main/resources/ui/scripts/init-ambari-view.js
@@ -72,6 +72,11 @@ function getQueryString(object) {
function redirectionCheck() {
var href = window.location.href;
+ // Ember expects the url to have /#/
+ if(href.indexOf('?') != -1 href.indexOf('/#/') == -1) {
+href = href.replace('?', '/#/?');
+ }
+
// If opened outside ambari, redirect
if(window.parent == window) {
var hrefParts = href.split('/#/'),
@@ -82,11 +87,17 @@ function redirectionCheck() {
queryParams[PATH_PARAM_NAME] = '/#/' + pathParts[0];
}
-window.location = '%@?%@'.fmt(
+href = '%@?%@'.fmt(
hrefParts[0].replace('/views/', '/#/main/views/'),
getQueryString(queryParams)
);
+ }
+ // Normalize href
+ href = href.replace(/\/\//g, '/').replace(':/', '://');
+
+ if(href != window.location.href) {
+window.location = href;
return true;
}
}
@@ -213,18 +224,15 @@ function loadParams() {
}
function onPathChange() {
-
var path = window.location.hash.substr(2).trim(),
pathParts = path.split('?'),
parentUrlParts = window.parent.location.href.split('?'),
- parentQueryParam = getQueryObject(parentUrlParts[1]);
+ parentQueryParam = getQueryObject(pathParts[1]);
- $.extend(parentQueryParam, getQueryObject(pathParts[1]));
- delete parentQueryParam[PATH_PARAM_NAME];
- if(pathParts[0]) {
-parentQueryParam[PATH_PARAM_NAME] = '/#/' + pathParts[0];
- }
+ if(pathParts[0]) {
+parentQueryParam[PATH_PARAM_NAME] = '/#/' + pathParts[0];
+ }
path = getQueryString(parentQueryParam);
window.parent.history.replaceState(
@@ -234,12 +242,15 @@ function onPathChange() {
);
}
+function scheduleChangeHandler(arguments) {
+ setTimeout(onPathChange, 100);
+}
+
if(!redirectionCheck()) {
App.ApplicationRoute.reopen({
actions: {
- didTransition: function (arguments) {
-setTimeout(onPathChange, 100);
- }
+ didTransition: scheduleChangeHandler,
+ queryParamsDidChange: scheduleChangeHandler
}
});
ambari git commit: AMBARI-11727 Perf: Set appropriate ulimit values for Metrics Hbase Master and Collector processes (dsen)
Repository: ambari Updated Branches: refs/heads/branch-2.1 cdd1a68fb - 3004eee05 AMBARI-11727 Perf: Set appropriate ulimit values for Metrics Hbase Master and Collector processes (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3004eee0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3004eee0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3004eee0 Branch: refs/heads/branch-2.1 Commit: 3004eee0535c923b9f46d5352c4e177984109bfd Parents: cdd1a68 Author: Dmytro Sen d...@apache.org Authored: Fri Jun 5 20:25:06 2015 +0300 Committer: Dmytro Sen d...@apache.org Committed: Fri Jun 5 20:26:12 2015 +0300 -- .../0.1.0/configuration/ams-hbase-env.xml | 7 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 15 + .../0.1.0/package/scripts/params.py | 2 ++ .../0.1.0/package/scripts/params_linux.py | 2 ++ .../0.1.0/package/templates/ams.conf.j2 | 35 5 files changed, 61 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/3004eee0/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml index 1734ac4..6325a50 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml @@ -69,6 +69,13 @@ sum of master and regionserver heap sizes. /description /property + property +namemax_open_files_limit/name +value32768/value +description +The maximum number of open file descriptors by process +/description + /property !-- hbase-env.sh -- property http://git-wip-us.apache.org/repos/asf/ambari/blob/3004eee0/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py index fc18042..b08e705 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py @@ -245,6 +245,21 @@ def ams(name=None): mode=0755 ) +# On some OS this folder could be not exists, so we will create it before pushing there files +Directory(params.limits_conf_dir, + recursive=True, + owner='root', + group='root' +) + +# Setting up security limits +File(os.path.join(params.limits_conf_dir, 'ams.conf'), + owner='root', + group='root', + mode=0644, + content=Template(ams.conf.j2) +) + # Phoenix spool file dir if not /tmp if not os.path.exists(params.phoenix_client_spool_dir): Directory(params.phoenix_client_spool_dir, http://git-wip-us.apache.org/repos/asf/ambari/blob/3004eee0/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py index 47fd2dd..4c78f77 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py @@ -110,6 +110,8 @@ if not is_hbase_distributed: else: hbase_heapsize = master_heapsize +max_open_files_limit = default(/configurations/ams-hbase-env/max_open_files_limit, 32768) + zookeeper_quorum_hosts = ','.join(ams_collector_hosts) if is_hbase_distributed else 'localhost' ams_checkpoint_dir = config['configurations']['ams-site']['timeline.metrics.aggregator.checkpoint.dir'] http://git-wip-us.apache.org/repos/asf/ambari/blob/3004eee0/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
ambari git commit: AMBARI-11711. Dashboard: graph descriptions are not very visible on service dashboard page.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 975cf26ab - e881532da
AMBARI-11711. Dashboard: graph descriptions are not very visible on service
dashboard page.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e881532d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e881532d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e881532d
Branch: refs/heads/trunk
Commit: e881532da13671f1843166ef9b74751dee0051b4
Parents: 975cf26
Author: Xi Wang xiw...@apache.org
Authored: Thu Jun 4 17:52:02 2015 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Fri Jun 5 11:11:59 2015 -0700
--
.../app/styles/enhanced_service_dashboard.less | 22
.../app/templates/main/charts/linear_time.hbs | 6 --
.../app/views/common/chart/linear_time.js | 3 ++-
ambari-web/vendor/scripts/rickshaw.js | 18
4 files changed, 42 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e881532d/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less
b/ambari-web/app/styles/enhanced_service_dashboard.less
index bde2828..0ff9c88 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -237,6 +237,28 @@
background: rgba(255,255,255, 0.7);
}
}
+ .thumbnail .chart-legend ul {
+max-width: 300px;
+.description-line {
+ padding: 3px 3px 8px 8px;
+ line-height: 16px;
+ max-height: 43px;
+ font-weight: bold;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ overflow: scroll;
+}
+ }
+}
+
+.chart-legend .description-line {
+ padding: 0px 3px 8px 8px;
+ line-height: 16px;
+ max-height: 45px;
+ font-weight: bold;
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ overflow: scroll;
}
#edit-widget-wizard,
http://git-wip-us.apache.org/repos/asf/ambari/blob/e881532d/ambari-web/app/templates/main/charts/linear_time.hbs
--
diff --git a/ambari-web/app/templates/main/charts/linear_time.hbs
b/ambari-web/app/templates/main/charts/linear_time.hbs
index b6bd6d0..24c13e9 100644
--- a/ambari-web/app/templates/main/charts/linear_time.hbs
+++ b/ambari-web/app/templates/main/charts/linear_time.hbs
@@ -30,9 +30,3 @@
{{/unless}}
/div
-{{#if view.description}}
- div class=hidden-description {{action showGraphInPopup target=view}}
-{{view.description}}
- /div
-{{/if}}
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/e881532d/ambari-web/app/views/common/chart/linear_time.js
--
diff --git a/ambari-web/app/views/common/chart/linear_time.js
b/ambari-web/app/views/common/chart/linear_time.js
index dbffe4b..7737700 100644
--- a/ambari-web/app/views/common/chart/linear_time.js
+++ b/ambari-web/app/views/common/chart/linear_time.js
@@ -593,7 +593,8 @@ App.ChartLinearTimeView = Ember.View.extend({
var legend = new Rickshaw.Graph.Legend({
graph: _graph,
- element: legendElement
+ element: legendElement,
+ description: self.get('description')
});
new Rickshaw.Graph.Behavior.Series.Toggle({
http://git-wip-us.apache.org/repos/asf/ambari/blob/e881532d/ambari-web/vendor/scripts/rickshaw.js
--
diff --git a/ambari-web/vendor/scripts/rickshaw.js
b/ambari-web/vendor/scripts/rickshaw.js
index 6beb828..8be0f97 100644
--- a/ambari-web/vendor/scripts/rickshaw.js
+++ b/ambari-web/vendor/scripts/rickshaw.js
@@ -1445,6 +1445,7 @@ Rickshaw.Graph.Behavior.Series.Toggle = function(args) {
var self = this;
this.addAnchor = function(line) {
+if (line.noAnchor) return;
var anchor = document.createElement('a');
anchor.innerHTML = '#10004;';
anchor.classList.add('action');
@@ -1830,6 +1831,23 @@ Rickshaw.Graph.Legend = function(args) {
self.lines.push(_line);
};
+ this.addDescription = function (description) {
+if (!description) return;
+var line = document.createElement('div');
+line.className = 'description-line';
+
+var label = document.createElement('span');
+label.innerHTML = description;
+
+line.appendChild(label);
+list.appendChild(line);
+
+var _line = { element: line, noAnchor: true};
+self.lines.push(_line);
+ };
+
+ self.addDescription(args.description);
+
series.forEach( function(s) {
self.addLine(s);
} );
ambari git commit: AMBARI-11733. Dashboard: nameNode RPC widget is n/a. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 007ab5db6 - b72f524be
AMBARI-11733. Dashboard: nameNode RPC widget is n/a. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b72f524b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b72f524b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b72f524b
Branch: refs/heads/branch-2.1
Commit: b72f524bea1f2da2328b43e271f2e2e17f318f13
Parents: 007ab5d
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Fri Jun 5 12:14:37 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Fri Jun 5 12:14:43 2015 -0700
--
.../common-services/HDFS/2.1.0.2.0/metrics.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b72f524b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
index 4cf93d5..b1e95fe 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
@@ -1710,7 +1710,7 @@
temporal: false
},
metrics/rpc/NumOpenConnections: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.NumOpenConnections,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.NumOpenConnections,
pointInTime: true,
temporal: false
},
@@ -1921,12 +1921,12 @@
temporal: false
},
metrics/rpc/RpcQueueTimeAvgTime: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.RpcQueueTimeAvgTime,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.RpcQueueTimeAvgTime,
pointInTime: true,
temporal: false
},
metrics/rpc/RpcProcessingTimeAvgTime: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.RpcProcessingTimeAvgTime,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.RpcProcessingTimeAvgTime,
pointInTime: true,
temporal: false
},
@@ -3449,7 +3449,7 @@
temporal: false
},
metrics/rpc/RpcProcessingTime_avg_time: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.RpcProcessingTimeAvgTime,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.RpcProcessingTimeAvgTime,
pointInTime: true,
temporal: false
},
@@ -3534,7 +3534,7 @@
temporal: false
},
metrics/rpc/RpcQueueTime_avg_time: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.RpcQueueTimeAvgTime,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.RpcQueueTimeAvgTime,
pointInTime: true,
temporal: false
},
@@ -3604,7 +3604,7 @@
temporal: false
},
metrics/rpc/NumOpenConnections: {
- metric:
Hadoop:service=NameNode,name=RpcActivityForPort8020.NumOpenConnections,
+ metric:
Hadoop:service=NameNode,name=RpcActivity.NumOpenConnections,
pointInTime: true,
temporal: false
},
ambari git commit: Revert AMBARI-502-PROXY-ERROR - Alert History Cannot Insert Into Oracle Database (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk d65accdcf - ae679e4ef
Revert AMBARI-502-PROXY-ERROR - Alert History Cannot Insert Into Oracle
Database (jonathanhurley)
This reverts commit d65accdcf859616d942754c87b12bec46ccd099b.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ae679e4e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae679e4e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae679e4e
Branch: refs/heads/trunk
Commit: ae679e4efa85ee99748ccde00bde8775dc0a4dcb
Parents: d65accd
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Fri Jun 5 11:52:03 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Fri Jun 5 11:52:03 2015 -0400
--
.../server/orm/entities/AlertHistoryEntity.java | 4 +-
.../server/upgrade/UpgradeCatalog210.java | 52 -
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +-
.../server/upgrade/UpgradeCatalog210Test.java | 112 +--
4 files changed, 54 insertions(+), 116 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae679e4e/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
index 9091398..8423abe 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
@@ -25,7 +25,6 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
@@ -69,8 +68,7 @@ public class AlertHistoryEntity {
@Column(name = alert_state, nullable = false, length = 255)
private AlertState alertState;
- @Lob
- @Column(name = alert_text)
+ @Column(name = alert_text, length = 32672)
private String alertText;
@Column(name = alert_timestamp, nullable = false)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae679e4e/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 a7a8cee..d83940e 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
@@ -18,22 +18,12 @@
package org.apache.ambari.server.upgrade;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.Root;
-
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -60,12 +50,20 @@ import
org.eclipse.persistence.internal.databaseaccess.FieldTypeDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.Root;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
@@ -120,7 +118,7 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
@Inject
ambari git commit: AMBARI-502-PROXY-ERROR - Alert History Cannot Insert Into Oracle Database (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk a22f819d4 - d65accdcf
AMBARI-502-PROXY-ERROR - Alert History Cannot Insert Into Oracle Database
(jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d65accdc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d65accdc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d65accdc
Branch: refs/heads/trunk
Commit: d65accdcf859616d942754c87b12bec46ccd099b
Parents: a22f819
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Thu Jun 4 23:25:34 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Fri Jun 5 10:49:17 2015 -0400
--
.../server/orm/entities/AlertHistoryEntity.java | 4 +-
.../server/upgrade/UpgradeCatalog210.java | 52 +
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +-
.../server/upgrade/UpgradeCatalog210Test.java | 112 ++-
4 files changed, 116 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d65accdc/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
index 8423abe..9091398 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
@@ -25,6 +25,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
@@ -68,7 +69,8 @@ public class AlertHistoryEntity {
@Column(name = alert_state, nullable = false, length = 255)
private AlertState alertState;
- @Column(name = alert_text, length = 32672)
+ @Lob
+ @Column(name = alert_text)
private String alertText;
@Column(name = alert_timestamp, nullable = false)
http://git-wip-us.apache.org/repos/asf/ambari/blob/d65accdc/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 d83940e..a7a8cee 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
@@ -18,12 +18,22 @@
package org.apache.ambari.server.upgrade;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.Root;
+
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -50,20 +60,12 @@ import
org.eclipse.persistence.internal.databaseaccess.FieldTypeDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.Root;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.persist.Transactional;
/**
@@ -118,7 +120,7 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
@Inject
private OsFamily osFamily;
-
+
/**
* {@inheritDoc}
*/
svn commit: r9234 - /release/ambari/KEYS
Author: jluniya Date: Fri Jun 5 17:15:03 2015 New Revision: 9234 Log: Updating KEYS for Ambari Modified: release/ambari/KEYS Modified: release/ambari/KEYS == --- release/ambari/KEYS (original) +++ release/ambari/KEYS Fri Jun 5 17:15:03 2015 @@ -361,4 +361,38 @@ cP+NH2wBYXS9wiMXCy3wFiXg3a5tmQE69/r+W/Cy YAtx4mlmrFO4i4SfBJePrZ9AQLlnpSWMOqzqhDys0djDhJb+KxU4u3t+h1xpa2v4 HjPhcszRSwXbQOIK4CzqzMhukuCJK9DqGzYgK1vAIx/qAiLyBt58xhke =z+Re --END PGP PUBLIC KEY BLOCK- \ No newline at end of file +-END PGP PUBLIC KEY BLOCK-pub 2048R/75C59ADF 2015-05-28 +uid Robert Nettleton (Ambari Release Management) rnettle...@apache.org +sub 2048R/BA19473B 2015-05-28 + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v2.0.22 (Darwin) + +mQENBFVne8MBCADb8xCJX7ALvxq4ORqPzPYnmumhtB1lArq5eenxkKIE/8zOcjQc +fqBmEW3Rc6wY2m2+/EmOEH6BJA/UNLp+2wIxOB48Q2rzlDn6NIU3mpYK3Imf3dyt +aIInfC3Iq1dqh6Ozfxte4SfkmPmeJM/KE6FPI/ukJs4SJXdbt+J6SQLxPF6YH18n +/MrkNd2aUeiQTDb6MFiOlauvLtkGwFYT305t14sI5A3ogcw7KMy9RTR9JEvTTK6V +wuXWQGMaR9HOptjMexNvHBS+jLLlu7fA4LZKOP3VldTr6Iq4yDg1Vhs3TK8vOQJC +nAaJJO3qockuA8oDkC7gfPnHh4el0tktqpPDABEBAAG0RFJvYmVydCBOZXR0bGV0 +b24gKEFtYmFyaSBSZWxlYXNlIE1hbmFnZW1lbnQpIDxybmV0dGxldG9uQGFwYWNo +ZS5vcmc+iQE5BBMBAgAjBQJVZ3vDAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgEC +F4AACgkQylLbv3XFmt+56ggAtT9oJmFZ3UhpX4vZpYkwtpUgonrYjPN+l2IPP69c +EV/9vm3i7sNSmGzPx49HjwLK2kR3v+AdEGygb36djFwRYYtZEct8aWbmzsSsGePL +f5ioMDUXOVYldG23cnB274TodEUCUkp8V99N3bV4anlbodgrZtzRRnfGG+/5W70D +lanrvn/wtimXXPJLQvQOF4EXU0ikxtWyM5gt9u8BFX+Uqq1FlP8ML7uFVUfpru6h +hDrH/HIiqRO5NYBlpUeXCS4D8dhkRcIdqOM89+CTQ279EDAilS1c1m7u0WAz4ZXk +9ozKav45n5/xLtmx79rG7BRTmF+TryoaVptZTtDJGPwyMrkBDQRVZ3vDAQgAtIvI +UBKyqjsPEB1PzWZiGcdJ7cFz3/nx8DiVzgDPNDsD1POPmi9DnuSsWxJtlvIQvVsy +W3di/LYj0Q2xycTGNOLWwtyhgiYs8FqtDwx6ZZKv0Qzy51u9SUlLefS+DxGWVyia +KIiHBR2ZwtMzOrtDP5EKL+Pgr3M/Rxj290BPUahucGtYsYMIfZi+pv4XMuEjE1h0 +QtUg8yW5x07qrWptatJyCHFb0UCCKS5BdesvqOYd2aM9cfdiNGfkBd6PiTX+QsgW +ltRITHuHONyloTs2g2C3cdHeLHN5zZVijviIcyL/tYG7UIR1gcG9EhmX/ceCmqkx +r1NPQ2K3R/uvIEGtWwARAQABiQEfBBgBAgAJBQJVZ3vDAhsMAAoJEMpS2791xZrf +6s0H/3KNSIkC8y1Brn82jfgRwlWtArZNy+/Mtgxrwh6Z9iCn0Xy8+iaWqprR0WNE +mOtULYrU/4v9pXbVY55EAAUWVgiwzbqu4+AO7Et+29uaU2aeayYD/730zxkxf0Um +eMIKumCQbmmO/phh9CTSB7pFoLSGRFXxSCK917rtJTJu513RfP0o5g60A2y2Yme6 +W/uCBcms42qQTmq2e5ROCfazl9VRQTjra6mHmWRZvcYOQlz4urEDlCmtbqscpDTa +O1DQFiGqhjJlh70nk4cXVo5Pfv1GO/UMqW2DheO+yRRJL6IlE4rS5odePF6aMC/I +pcfmpRYh8Lfkv17xQXIgbnKHegQ= +=rkpK +-END PGP PUBLIC KEY BLOCK-
ambari git commit: Initial version updates as part of the creation of the 2.1 branch
Repository: ambari Updated Branches: refs/heads/branch-2.1 [created] 60478c8c0 Initial version updates as part of the creation of the 2.1 branch Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/60478c8c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60478c8c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60478c8c Branch: refs/heads/branch-2.1 Commit: 60478c8c0cccb35d2eca8e827244aac1070f Parents: fb90a26 Author: Bob Nettleton rnettle...@hortonworks.com Authored: Fri Jun 5 11:26:20 2015 -0400 Committer: Bob Nettleton rnettle...@hortonworks.com Committed: Fri Jun 5 11:26:20 2015 -0400 -- ambari-admin/pom.xml | 4 ++-- ambari-agent/pom.xml | 4 ++-- ambari-client/groovy-client/pom.xml | 4 ++-- ambari-client/pom.xml | 4 ++-- ambari-client/python-client/pom.xml | 4 ++-- ambari-metrics/ambari-metrics-assembly/pom.xml| 4 ++-- ambari-metrics/ambari-metrics-common/pom.xml | 2 +- ambari-metrics/ambari-metrics-flume-sink/pom.xml | 4 ++-- ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 4 ++-- ambari-metrics/ambari-metrics-host-monitoring/pom.xml | 4 ++-- ambari-metrics/ambari-metrics-kafka-sink/pom.xml | 4 ++-- ambari-metrics/ambari-metrics-storm-sink/pom.xml | 4 ++-- ambari-metrics/ambari-metrics-timelineservice/pom.xml | 6 +++--- ambari-metrics/pom.xml| 2 +- ambari-project/pom.xml| 4 ++-- ambari-server/pom.xml | 4 ++-- ambari-shell/ambari-groovy-shell/pom.xml | 6 +++--- ambari-shell/ambari-python-shell/pom.xml | 4 ++-- ambari-shell/pom.xml | 4 ++-- ambari-views/examples/auto-cluster-view/pom.xml | 4 ++-- ambari-views/examples/calculator-view/pom.xml | 2 +- ambari-views/examples/cluster-view/pom.xml| 4 ++-- ambari-views/examples/favorite-view/pom.xml | 2 +- ambari-views/examples/hello-servlet-view/pom.xml | 4 ++-- ambari-views/examples/hello-spring-view/pom.xml | 4 ++-- ambari-views/examples/helloworld-view/pom.xml | 4 ++-- ambari-views/examples/phone-list-view/pom.xml | 2 +- ambari-views/examples/pom.xml | 4 ++-- ambari-views/examples/property-validator-view/pom.xml | 6 +++--- ambari-views/examples/property-view/pom.xml | 4 ++-- ambari-views/examples/restricted-view/pom.xml | 2 +- ambari-views/examples/simple-view/pom.xml | 4 ++-- ambari-views/examples/weather-view/pom.xml| 2 +- ambari-views/pom.xml | 4 ++-- ambari-web/pom.xml| 4 ++-- contrib/ambari-log4j/pom.xml | 2 +- contrib/ambari-scom/ambari-scom-server/pom.xml| 4 ++-- contrib/ambari-scom/metrics-sink/pom.xml | 2 +- contrib/ambari-scom/pom.xml | 2 +- contrib/views/capacity-scheduler/pom.xml | 2 +- contrib/views/files/pom.xml | 2 +- contrib/views/hive/pom.xml| 4 ++-- contrib/views/jobs/pom.xml| 4 ++-- contrib/views/pig/pom.xml | 4 ++-- contrib/views/pom.xml | 8 contrib/views/slider/pom.xml | 4 ++-- contrib/views/storm/pom.xml | 2 +- contrib/views/tez/pom.xml | 2 +- contrib/views/utils/pom.xml | 2 +- docs/pom.xml | 4 ++-- pom.xml | 2 +- 51 files changed, 91 insertions(+), 91 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/60478c8c/ambari-admin/pom.xml -- diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml index 2d3ad25..9125fb3 100644 --- a/ambari-admin/pom.xml +++ b/ambari-admin/pom.xml @@ -19,7 +19,7 @@ parent groupIdorg.apache.ambari/groupId artifactIdambari-project/artifactId -version2.0.0-SNAPSHOT/version +version2.1.0.0/version relativePath../ambari-project/relativePath /parent modelVersion4.0.0/modelVersion @@ -27,7 +27,7 @@ artifactIdambari-admin/artifactId packagingjar/packaging nameAmbari Admin View/name - version2.0.0-SNAPSHOT/version + version2.1.0.0/version descriptionAdmin control panel/description build plugins
ambari git commit: AMBARI-11185. Edit Repositories on an added repo version fails with 500 status code. (Di Li via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk c7b0688a4 - 8e496ce61
AMBARI-11185. Edit Repositories on an added repo version fails with 500 status
code. (Di Li via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e496ce6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e496ce6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e496ce6
Branch: refs/heads/trunk
Commit: 8e496ce6114fd6ee0a8450ab9cbde6df68bbca1a
Parents: c7b0688
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Fri Jun 5 13:48:52 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Fri Jun 5 13:48:52 2015 -0700
--
.../main/admin/stack_and_upgrade_controller.js | 24
.../stack_upgrade/upgrade_version_box_view.js | 20 +
.../admin/stack_and_upgrade_controller_test.js | 24
.../upgrade_version_box_view_test.js| 30 +++-
4 files changed, 92 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e496ce6/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 890e5d8..ac8f8cf 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -557,6 +557,17 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
},
/**
+ * Return stack version for the repo object
+ * @param {Em.Object} repo
+ * */
+ getStackVersionNumber: function(repo){
+var stackVersionNumber = repo.get('stackVersion');
+if(null == stackVersionNumber)
+ stackVersionNumber = App.get('currentStackVersion');
+return stackVersionNumber;
+ },
+
+ /**
* perform validation if codeskipcode is false and run save if
* validation successfull or run save without validation is codeskipcode
is true
* @param {Em.Object} repo
@@ -571,13 +582,15 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
deferred.resolve(data);
} else {
var repoVersion = self.prepareRepoForSaving(repo);
-
+var stackVersionNumber = self.getStackVersionNumber(repo);
+console.log(Repository stack version:+stackVersionNumber);
+
App.ajax.send({
name: 'admin.stack_versions.edit.repo',
sender: this,
data: {
stackName: App.get('currentStackName'),
-stackVersion: App.get('currentStackVersionNumber'),
+stackVersion: stackVersionNumber,
repoVersionId: repo.get('repoVersionId'),
repoVersion: repoVersion
}
@@ -588,7 +601,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
});
return deferred.promise();
},
-
+
/**
* send request for validation for each repository
* @param {Em.Object} repo
@@ -599,10 +612,11 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
var deferred = $.Deferred(),
totalCalls = 0,
invalidUrls = [];
-
+
if (skip) {
deferred.resolve(invalidUrls);
} else {
+ var stackVersionNumber = this.getStackVersionNumber(repo);
repo.get('operatingSystems').forEach(function (os) {
if (os.get('isSelected')) {
os.get('repositories').forEach(function (repo) {
@@ -616,7 +630,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
baseUrl: repo.get('baseUrl'),
osType: os.get('osType'),
stackName: App.get('currentStackName'),
-stackVersion: App.get('currentStackVersionNumber')
+stackVersion: stackVersionNumber
}
})
.success(function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e496ce6/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
--
diff --git
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index f9c4ef2..28d1428 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -186,6 +186,25 @@ App.UpgradeVersionBoxView = Em.View.extend({
},
/**
+ * @param App.RepositoryVersion
+ * */
+ getStackVersionNumber:
ambari git commit: AMBARI-11714: [WinTP2] Address build issues on Windows (jluniya)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 b72f524be - fa33c51aa
AMBARI-11714: [WinTP2] Address build issues on Windows (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa33c51a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa33c51a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa33c51a
Branch: refs/heads/branch-2.1
Commit: fa33c51aa1985228da01b7331619e6990a239728
Parents: b72f524
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Fri Jun 5 12:05:40 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Fri Jun 5 12:58:52 2015 -0700
--
ambari-metrics/pom.xml | 2 +-
ambari-web/set-ambari-version.cmd | 2 +-
ambari-web/set-default-stack-version.cmd| 2 +-
ambari-web/toggle-experimental.cmd | 2 +-
contrib/views/capacity-scheduler/pom.xml| 16
.../src/main/resources/ui/package.json | 3 +--
contrib/views/files/pom.xml | 16
.../views/files/src/main/resources/ui/package.json | 3 +--
contrib/views/pig/pom.xml | 16
.../pig/src/main/resources/ui/pig-web/package.json | 3 +--
10 files changed, 55 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa33c51a/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 2a26d58..89ceb84 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -154,7 +154,7 @@
namepackage-release/name
value${project.version}/value
regex
-^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)(([0-9]+)|(SNAPSHOT)).*
+
^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
/regex
replacement$5/replacement
failIfNoMatchtrue/failIfNoMatch
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa33c51a/ambari-web/set-ambari-version.cmd
--
diff --git a/ambari-web/set-ambari-version.cmd
b/ambari-web/set-ambari-version.cmd
index 14fdec6..2b827fc 100644
--- a/ambari-web/set-ambari-version.cmd
+++ b/ambari-web/set-ambari-version.cmd
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File set-ambari-version.ps1 %*
\ No newline at end of file
+powershell -File set-ambari-version.ps1 %* NUL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa33c51a/ambari-web/set-default-stack-version.cmd
--
diff --git a/ambari-web/set-default-stack-version.cmd
b/ambari-web/set-default-stack-version.cmd
index e724e1f..9f8a252 100644
--- a/ambari-web/set-default-stack-version.cmd
+++ b/ambari-web/set-default-stack-version.cmd
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File set-default-stack-version.ps1 %*
\ No newline at end of file
+powershell -File set-default-stack-version.ps1 %* NUL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa33c51a/ambari-web/toggle-experimental.cmd
--
diff --git a/ambari-web/toggle-experimental.cmd
b/ambari-web/toggle-experimental.cmd
index 9552279..6cda98e 100644
--- a/ambari-web/toggle-experimental.cmd
+++ b/ambari-web/toggle-experimental.cmd
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-powershell -File toggle-experimental.ps1 %*
\ No newline at end of file
+powershell -File toggle-experimental.ps1 %* NUL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa33c51a/contrib/views/capacity-scheduler/pom.xml
--
diff --git a/contrib/views/capacity-scheduler/pom.xml
b/contrib/views/capacity-scheduler/pom.xml
index 243a85a..f7a9714 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -161,6 +161,22 @@
/configuration
/execution
execution
+idBower install/id
+
ambari git commit: Revert AMBARI-11721. Handle if non-default value is used for hbase.tmp.dir (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 8e496ce61 - 7eaf73c30
Revert AMBARI-11721. Handle if non-default value is used for hbase.tmp.dir
(aonishuk)
This reverts commit fb90a26e82a58c9b72d506786fbdb6decc759dff.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7eaf73c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7eaf73c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7eaf73c3
Branch: refs/heads/trunk
Commit: 7eaf73c3086f842eac2eba344fc7080b4f6b477a
Parents: 8e496ce
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Fri Jun 5 14:22:50 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Fri Jun 5 14:22:50 2015 -0700
--
.../0.96.0.2.0/configuration/hbase-site.xml | 2 +-
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 17 +++-
.../0.96.0.2.0/package/scripts/params_linux.py | 3 +-
.../stacks/2.0.6/HBASE/test_hbase_client.py | 26 -
.../stacks/2.0.6/HBASE/test_hbase_master.py | 39 +--
.../2.0.6/HBASE/test_hbase_regionserver.py | 41 ++--
.../2.0.6/HBASE/test_phoenix_queryserver.py | 26 -
.../python/stacks/2.0.6/configs/default.json| 2 +-
.../python/stacks/2.0.6/configs/hbase-2.2.json | 2 +-
.../stacks/2.0.6/configs/hbase-check-2.2.json | 4 +-
.../stacks/2.0.6/configs/hbase-preupgrade.json | 2 +-
.../stacks/2.0.6/configs/hbase-rs-2.2.json | 2 +-
.../python/stacks/2.0.6/configs/secured.json| 2 +-
.../stacks/2.3/configs/hbase_default.json | 2 +-
.../python/stacks/2.3/configs/hbase_secure.json | 2 +-
15 files changed, 147 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7eaf73c3/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
index 1cad600..65f72a7 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
@@ -49,7 +49,7 @@
/property
property
namehbase.tmp.dir/name
-value/tmp/hbase-{{hbase_user}}/value
+value/tmp/hbase-${user.name}/value
descriptionTemporary directory on the local filesystem.
Change this setting to point to a location more permanent
than '/tmp' (The '/tmp' directory is often cleared on
http://git-wip-us.apache.org/repos/asf/ambari/blob/7eaf73c3/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
index 0478398..1bfa7e4 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
@@ -56,14 +56,27 @@ def hbase(name=None):
recursive = True
)
- Directory (InlineTemplate(params.hbase_tmp_dir).get_content()+/local/jars,
+ Directory (params.tmp_dir,
owner = params.hbase_user,
- group = params.user_group,
mode=0775,
recursive = True,
cd_access=a,
)
+ Directory (params.local_dir,
+ owner = params.hbase_user,
+ group = params.user_group,
+ mode=0775,
+ recursive = True
+ )
+
+ Directory (os.path.join(params.local_dir, jars),
+ owner = params.hbase_user,
+ group = params.user_group,
+ mode=0775,
+ recursive = True
+ )
+
XmlConfig( hbase-site.xml,
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hbase-site'],
http://git-wip-us.apache.org/repos/asf/ambari/blob/7eaf73c3/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index d25eac8..e8585cd 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
ambari git commit: AMBARI-11185. Edit Repositories on an added repo version fails with 500 status code. (Di Li via Jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 fa33c51aa - d7a800efa
AMBARI-11185. Edit Repositories on an added repo version fails with 500 status
code. (Di Li via Jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7a800ef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7a800ef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7a800ef
Branch: refs/heads/branch-2.1
Commit: d7a800efa84358541d8208c2e8d5f53095cd2458
Parents: fa33c51
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Fri Jun 5 13:48:52 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Fri Jun 5 13:49:52 2015 -0700
--
.../main/admin/stack_and_upgrade_controller.js | 24
.../stack_upgrade/upgrade_version_box_view.js | 20 +
.../admin/stack_and_upgrade_controller_test.js | 24
.../upgrade_version_box_view_test.js| 30 +++-
4 files changed, 92 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7a800ef/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 890e5d8..ac8f8cf 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -557,6 +557,17 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
},
/**
+ * Return stack version for the repo object
+ * @param {Em.Object} repo
+ * */
+ getStackVersionNumber: function(repo){
+var stackVersionNumber = repo.get('stackVersion');
+if(null == stackVersionNumber)
+ stackVersionNumber = App.get('currentStackVersion');
+return stackVersionNumber;
+ },
+
+ /**
* perform validation if codeskipcode is false and run save if
* validation successfull or run save without validation is codeskipcode
is true
* @param {Em.Object} repo
@@ -571,13 +582,15 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
deferred.resolve(data);
} else {
var repoVersion = self.prepareRepoForSaving(repo);
-
+var stackVersionNumber = self.getStackVersionNumber(repo);
+console.log(Repository stack version:+stackVersionNumber);
+
App.ajax.send({
name: 'admin.stack_versions.edit.repo',
sender: this,
data: {
stackName: App.get('currentStackName'),
-stackVersion: App.get('currentStackVersionNumber'),
+stackVersion: stackVersionNumber,
repoVersionId: repo.get('repoVersionId'),
repoVersion: repoVersion
}
@@ -588,7 +601,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
});
return deferred.promise();
},
-
+
/**
* send request for validation for each repository
* @param {Em.Object} repo
@@ -599,10 +612,11 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
var deferred = $.Deferred(),
totalCalls = 0,
invalidUrls = [];
-
+
if (skip) {
deferred.resolve(invalidUrls);
} else {
+ var stackVersionNumber = this.getStackVersionNumber(repo);
repo.get('operatingSystems').forEach(function (os) {
if (os.get('isSelected')) {
os.get('repositories').forEach(function (repo) {
@@ -616,7 +630,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
baseUrl: repo.get('baseUrl'),
osType: os.get('osType'),
stackName: App.get('currentStackName'),
-stackVersion: App.get('currentStackVersionNumber')
+stackVersion: stackVersionNumber
}
})
.success(function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7a800ef/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
--
diff --git
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index f9c4ef2..28d1428 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -186,6 +186,25 @@ App.UpgradeVersionBoxView = Em.View.extend({
},
/**
+ * @param App.RepositoryVersion
+ * */
+
ambari git commit: AMBARI-11734 - Missing Falcon conf files after rolling upgrade (jonathanhurley)
Repository: ambari Updated Branches: refs/heads/trunk fdaa98043 - c33b8ee26 AMBARI-11734 - Missing Falcon conf files after rolling upgrade (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c33b8ee2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c33b8ee2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c33b8ee2 Branch: refs/heads/trunk Commit: c33b8ee26849accf516ca0afd0bb811513e65c9c Parents: fdaa980 Author: Jonathan Hurley jhur...@hortonworks.com Authored: Fri Jun 5 15:44:34 2015 -0400 Committer: Jonathan Hurley jhur...@hortonworks.com Committed: Fri Jun 5 22:05:20 2015 -0400 -- .../libraries/functions/tar_archive.py | 26 .../package/scripts/falcon_server_upgrade.py| 10 +++- .../1.4.0.2.0/package/scripts/flume_upgrade.py | 11 +++-- .../KNOX/0.5.0.2.2/package/scripts/upgrade.py | 12 - .../package/scripts/oozie_server_upgrade.py | 10 +++- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 8 ++ .../stacks/2.1/FALCON/test_falcon_server.py | 8 ++ 7 files changed, 57 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c33b8ee2/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py -- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py b/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py index efbf933..f1fb597 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py @@ -28,3 +28,29 @@ def archive_dir(output_filename, input_dir): tar.add(input_dir, arcname=os.path.basename(.)) finally: tar.close() + + +def archive_directory_dereference(archive, directory): + + Creates an archive of the specified directory. This will ensure that + symlinks are not included, but instead are followed for recursive inclusion. + :param archive: the name of the archive to create, including path + :param directory: the directory to include + :return: None + + tarball = None + try: +# !!! dereference must be TRUE since the conf is a symlink and we want +# its contents instead of the actual symlink +tarball = tarfile.open(archive, mode=w, dereference=True) + +# tar the files, chopping off everything in front of directory +# /foo/bar/conf/a, /foo/bar/conf/b, /foo/bar/conf/dir/c +# becomes +# a +# b +# dir/c +tarball.add(directory, arcname=os.path.relpath(directory, start=directory)) + finally: +if tarball: + tarball.close() \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/c33b8ee2/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py -- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py index e6819d2..07cfbf6 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py @@ -23,6 +23,7 @@ import tempfile from resource_management.core.logger import Logger from resource_management.core.exceptions import Fail +from resource_management.libraries.functions import tar_archive BACKUP_TEMP_DIR = falcon-upgrade-backup BACKUP_DATA_ARCHIVE = falcon-local-backup.tar @@ -51,13 +52,8 @@ def post_stop_backup(): if os.path.exists(archive): os.remove(archive) -tarball = None -try: - tarball = tarfile.open(archive, w) - tarball.add(directory, arcname=os.path.basename(directory)) -finally: - if tarball: -tarball.close() +# backup the directory, following symlinks instead of including them +tar_archive.archive_directory_dereference(archive, directory) def pre_start_restore(): http://git-wip-us.apache.org/repos/asf/ambari/blob/c33b8ee2/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_upgrade.py -- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_upgrade.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_upgrade.py index e2028fc..265bf5e 100644
ambari git commit: AMBARI-11734 - Missing Falcon conf files after rolling upgrade (jonathanhurley)
Repository: ambari Updated Branches: refs/heads/branch-2.1 105f203af - b1204e543 AMBARI-11734 - Missing Falcon conf files after rolling upgrade (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1204e54 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1204e54 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1204e54 Branch: refs/heads/branch-2.1 Commit: b1204e543a99a5b80bd114f0cdd24f3908c6e46c Parents: 105f203 Author: Jonathan Hurley jhur...@hortonworks.com Authored: Fri Jun 5 15:44:34 2015 -0400 Committer: Jonathan Hurley jhur...@hortonworks.com Committed: Fri Jun 5 22:06:10 2015 -0400 -- .../libraries/functions/tar_archive.py | 26 .../package/scripts/falcon_server_upgrade.py| 10 +++- .../1.4.0.2.0/package/scripts/flume_upgrade.py | 11 +++-- .../KNOX/0.5.0.2.2/package/scripts/upgrade.py | 12 - .../package/scripts/oozie_server_upgrade.py | 10 +++- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 8 ++ .../stacks/2.1/FALCON/test_falcon_server.py | 8 ++ 7 files changed, 57 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b1204e54/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py -- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py b/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py index efbf933..f1fb597 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py @@ -28,3 +28,29 @@ def archive_dir(output_filename, input_dir): tar.add(input_dir, arcname=os.path.basename(.)) finally: tar.close() + + +def archive_directory_dereference(archive, directory): + + Creates an archive of the specified directory. This will ensure that + symlinks are not included, but instead are followed for recursive inclusion. + :param archive: the name of the archive to create, including path + :param directory: the directory to include + :return: None + + tarball = None + try: +# !!! dereference must be TRUE since the conf is a symlink and we want +# its contents instead of the actual symlink +tarball = tarfile.open(archive, mode=w, dereference=True) + +# tar the files, chopping off everything in front of directory +# /foo/bar/conf/a, /foo/bar/conf/b, /foo/bar/conf/dir/c +# becomes +# a +# b +# dir/c +tarball.add(directory, arcname=os.path.relpath(directory, start=directory)) + finally: +if tarball: + tarball.close() \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/b1204e54/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py -- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py index e6819d2..07cfbf6 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon_server_upgrade.py @@ -23,6 +23,7 @@ import tempfile from resource_management.core.logger import Logger from resource_management.core.exceptions import Fail +from resource_management.libraries.functions import tar_archive BACKUP_TEMP_DIR = falcon-upgrade-backup BACKUP_DATA_ARCHIVE = falcon-local-backup.tar @@ -51,13 +52,8 @@ def post_stop_backup(): if os.path.exists(archive): os.remove(archive) -tarball = None -try: - tarball = tarfile.open(archive, w) - tarball.add(directory, arcname=os.path.basename(directory)) -finally: - if tarball: -tarball.close() +# backup the directory, following symlinks instead of including them +tar_archive.archive_directory_dereference(archive, directory) def pre_start_restore(): http://git-wip-us.apache.org/repos/asf/ambari/blob/b1204e54/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_upgrade.py -- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_upgrade.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_upgrade.py index
[2/2] ambari git commit: AMBARI-11748. 'hbase.region.server.rpc.scheduler.factory.class' has been misspelt (srimanth)
AMBARI-11748. 'hbase.region.server.rpc.scheduler.factory.class' has been
misspelt (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/74d73d66
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/74d73d66
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/74d73d66
Branch: refs/heads/branch-2.1
Commit: 74d73d66236a1772ce76d141ed002f4c372138c1
Parents: 814800a
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Fri Jun 5 19:08:20 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Fri Jun 5 19:08:27 2015 -0700
--
.../stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml | 2 +-
ambari-web/app/data/HDP2.2/site_properties.js| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/74d73d66/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
index 429b763..382608e 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
@@ -126,7 +126,7 @@
/depends-on
/property
property
-namehbase.regionserver.rpc.scheduler.factory.class/name
+namehbase.region.server.rpc.scheduler.factory.class/name
value/value
depends-on
property
http://git-wip-us.apache.org/repos/asf/ambari/blob/74d73d66/ambari-web/app/data/HDP2.2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js
b/ambari-web/app/data/HDP2.2/site_properties.js
index f4be8c7..f81cb0c 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -908,8 +908,8 @@ hdp22properties.push(
},
{
id: site property,
-name: hbase.regionserver.rpc.scheduler.factory.class,
-displayName: hbase.regionserver.rpc.scheduler.factory.class,
+name: hbase.region.server.rpc.scheduler.factory.class,
+displayName: hbase.region.server.rpc.scheduler.factory.class,
defaultValue: ,
isRequired: false,
category: Advanced hbase-site,
ambari git commit: AMBARI-11747. Modify resource pre-upload script to handle recent changes to stack and HdfsResource (smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 89ba4a4bb - e973a534f
AMBARI-11747. Modify resource pre-upload script to handle recent changes to
stack and HdfsResource (smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e973a534
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e973a534
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e973a534
Branch: refs/heads/trunk
Commit: e973a534f0fcb331dc8d71bdb59843189fdfc2b5
Parents: 89ba4a4
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Fri Jun 5 18:43:45 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Fri Jun 5 18:43:45 2015 -0700
--
.../main/resources/scripts/Ambaripreupload.py | 37 +++-
1 file changed, 28 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e973a534/ambari-server/src/main/resources/scripts/Ambaripreupload.py
--
diff --git a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
index 548983c..fd72f24 100644
--- a/ambari-server/src/main/resources/scripts/Ambaripreupload.py
+++ b/ambari-server/src/main/resources/scripts/Ambaripreupload.py
@@ -63,20 +63,21 @@ def getPropertyValueFromConfigXMLFile(xmlfile, name,
defaultValue=None):
if len(node.childNodes) 0:
return node.childNodes[0].nodeValue
else:
- return ''
+ return defaultValue
return defaultValue
def get_fs_root(fsdefaultName=None):
- return getPropertyValueFromConfigXMLFile(/etc/hadoop/conf/core-site.xml,
fs.defaultFS)
- if fsdefaultName is None:
-fsdefaultName = fake
+ fsdefaultName = fake
while (not fsdefaultName.startswith(wasb://)):
fsdefaultName =
getPropertyValueFromConfigXMLFile(/etc/hadoop/conf/core-site.xml,
fs.defaultFS)
if fsdefaultName is None:
fsdefaultName = fake
+print Waiting to read appropriate value of fs.defaultFS from
/etc/hadoop/conf/core-site.xml ...
time.sleep(10)
-
+pass
+
+ print Returning fs.defaultFS - + fsdefaultName
return fsdefaultName
# These values must be the suffix of the properties in cluster-env.xml
@@ -94,9 +95,20 @@ class params:
execute_path = /usr/hdp/current/hadoop-client/bin
ambari_libs_dir = /var/lib/ambari-agent/lib
hdfs_site = ConfigDictionary({'dfs.webhdfs.enabled':False,
-'dfs.namenode.http-address':
getPropertyValueFromConfigXMLFile(/etc/hadoop/conf/hdfs-site.xml,
dfs.namenode.http-address)
})
fs_default = get_fs_root()
+ oozie_env_sh_template = \
+'''
+#!/bin/bash
+
+export OOZIE_CONFIG=${OOZIE_CONFIG:-/usr/hdp/current/oozie/conf}
+export OOZIE_DATA=${OOZIE_DATA:-/var/lib/oozie/data}
+export OOZIE_LOG=${OOZIE_LOG:-/var/log/oozie}
+export
CATALINA_BASE=${CATALINA_BASE:-/usr/hdp/current/oozie-server/oozie-server}
+export CATALINA_TMPDIR=${CATALINA_TMPDIR:-/var/tmp/oozie}
+export CATALINA_PID=${CATALINA_PID:-/var/run/oozie/oozie.pid}
+export OOZIE_CATALINA_HOME=/usr/lib/bigtop-tomcat
+'''
HdfsResource = functools.partial(
HdfsResource,
@@ -213,7 +225,12 @@ no_op_test = ls /var/run/oozie/oozie.pid /dev/null 21
ps -p `cat /var/run
with Environment() as env:
env.set_params(params)
-
+
+ File(/etc/oozie/conf/oozie-env.sh,
+ owner=params.oozie_user,
+ content=params.oozie_env_sh_template
+ )
+
hashcode_file = format({oozie_home}/.hashcode)
hashcode =
hashlib.md5(format('{oozie_home}/oozie-sharelib.tar.gz')).hexdigest()
skip_recreate_sharelib = format(test -f {hashcode_file} test -d
{oozie_home}/share [[ `cat {hashcode_file}` == '{hashcode}' ]])
@@ -250,13 +267,14 @@ with Environment() as env:
source = oozie_shared_lib,
)
+ print Copying tarballs...
copy_tarballs_to_hdfs(/usr/hdp/current/hadoop-client/mapreduce.tar.gz,
hdfs_path_prefix+/hdp/apps/{{ hdp_stack_version }}/mapreduce/,
'hadoop-mapreduce-historyserver', params.mapred_user, params.hdfs_user,
params.user_group)
copy_tarballs_to_hdfs(/usr/hdp/current/tez-client/lib/tez.tar.gz,
hdfs_path_prefix+/hdp/apps/{{ hdp_stack_version }}/tez/,
'hadoop-mapreduce-historyserver', params.mapred_user, params.hdfs_user,
params.user_group)
copy_tarballs_to_hdfs(/usr/hdp/current/hive-client/hive.tar.gz,
hdfs_path_prefix+/hdp/apps/{{ hdp_stack_version }}/hive/,
'hadoop-mapreduce-historyserver', params.mapred_user, params.hdfs_user,
params.user_group)
copy_tarballs_to_hdfs(/usr/hdp/current/pig-client/pig.tar.gz,
hdfs_path_prefix+/hdp/apps/{{ hdp_stack_version }}/pig/,
'hadoop-mapreduce-historyserver', params.mapred_user, params.hdfs_user,
params.user_group)
[1/2] ambari git commit: AMBARI-11745. 'yarn.admin.acl' have default value of 'yarn', and should be updated when 'yarn_user' is changed
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 b1204e543 - 74d73d662
AMBARI-11745. 'yarn.admin.acl' have default value of 'yarn', and should be
updated when 'yarn_user' is changed
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/814800a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/814800a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/814800a5
Branch: refs/heads/branch-2.1
Commit: 814800a54a81fdac4721a21ec58ce9e8e4429fb9
Parents: b1204e5
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Fri Jun 5 17:34:13 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Fri Jun 5 19:08:26 2015 -0700
--
.../services/YARN/configuration/yarn-site.xml | 6 +
ambari-web/app/assets/test/tests.js | 1 +
.../utils/configs/modification_handlers/misc.js | 47 +++-
.../configs/service_configs_by_category_view.js | 2 +-
.../configs/modification_handlers/misc_test.js | 112 +++
5 files changed, 163 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/814800a5/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
index 58c817f..f2774fc 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
@@ -31,4 +31,10 @@
valuetrue/value
/property
+ property
+nameyarn.admin.acl/name
+valueyarn/value
+description ACL of who can be admin of the YARN cluster. /description
+ /property
+
/configuration
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/814800a5/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 1be092c..7338dbf 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -172,6 +172,7 @@ var files = ['test/init_model_test',
'test/utils/configs/database_test',
'test/utils/configs/config_property_helper_test',
'test/utils/configs/modification_handlers/modification_handler_test',
+ 'test/utils/configs/modification_handlers/misc_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/814800a5/ambari-web/app/utils/configs/modification_handlers/misc.js
--
diff --git a/ambari-web/app/utils/configs/modification_handlers/misc.js
b/ambari-web/app/utils/configs/modification_handlers/misc.js
index 42decb5..2af27ef 100644
--- a/ambari-web/app/utils/configs/modification_handlers/misc.js
+++ b/ambari-web/app/utils/configs/modification_handlers/misc.js
@@ -53,11 +53,50 @@ module.exports =
App.ServiceConfigModificationHandler.create({
filename : 'hdfs-site.xml'
});
}
+} else if (changedConfig.get(name) == yarn_user) {
+ curConfigs = allConfigs.findProperty('serviceName',
'YARN').get('configs');
+ var currentUsers,
+ currentGroups;
+ var initialUser = changedConfig.get('initialValue');
+ var newUser = newValue;
+ var currentAclValue = curConfigs.findProperty(name,
yarn.admin.acl).get(value);
+ var currentAclValueSplits =
$.trim(currentAclValue).split(/\s+/).filter(function(i) { return
!Em.isEmpty(i); });
+ if (currentAclValueSplits.length == 2) {
+currentUsers = currentAclValueSplits[0];
+currentGroups = currentAclValueSplits[1];
+ } else {
+currentUsers = currentAclValueSplits.length 0 ?
currentAclValueSplits.shift() : ''
+currentGroups = currentAclValueSplits.join( );
+ }
+ var currentUserList = currentUsers.split(',').filter(function(i) {
return !Em.isEmpty(i); });
+ if (!currentUserList.contains(newUser)) {
+var currentUserIndex = currentUserList.indexOf(initialUser);
+if (currentUserIndex -1) {
+ currentUserList.splice(currentUserIndex, 1);
+}
+if (!currentUserList.contains(newUser)) {
+ currentUserList.push(newUser);
+}
+var newAclValue = $.trim(currentUserList.join(',') + ' ' +
currentGroups);
+if (currentAclValue != newAclValue) {
+
[2/2] ambari git commit: AMBARI-11745. 'yarn.admin.acl' have default value of 'yarn', and should be updated when 'yarn_user' is changed
AMBARI-11745. 'yarn.admin.acl' have default value of 'yarn', and should be
updated when 'yarn_user' is changed
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b2cb5088
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b2cb5088
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b2cb5088
Branch: refs/heads/trunk
Commit: b2cb508858bca937e55bea7d019cfa4dbc4e3aea
Parents: e202aaa
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Fri Jun 5 17:34:13 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Fri Jun 5 19:23:24 2015 -0700
--
.../services/YARN/configuration/yarn-site.xml | 6 +
ambari-web/app/assets/test/tests.js | 1 +
.../utils/configs/modification_handlers/misc.js | 47 +++-
.../configs/service_configs_by_category_view.js | 2 +-
.../configs/modification_handlers/misc_test.js | 112 +++
5 files changed, 163 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b2cb5088/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
index 58c817f..f2774fc 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
@@ -31,4 +31,10 @@
valuetrue/value
/property
+ property
+nameyarn.admin.acl/name
+valueyarn/value
+description ACL of who can be admin of the YARN cluster. /description
+ /property
+
/configuration
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/b2cb5088/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 1be092c..7338dbf 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -172,6 +172,7 @@ var files = ['test/init_model_test',
'test/utils/configs/database_test',
'test/utils/configs/config_property_helper_test',
'test/utils/configs/modification_handlers/modification_handler_test',
+ 'test/utils/configs/modification_handlers/misc_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/b2cb5088/ambari-web/app/utils/configs/modification_handlers/misc.js
--
diff --git a/ambari-web/app/utils/configs/modification_handlers/misc.js
b/ambari-web/app/utils/configs/modification_handlers/misc.js
index 42decb5..2af27ef 100644
--- a/ambari-web/app/utils/configs/modification_handlers/misc.js
+++ b/ambari-web/app/utils/configs/modification_handlers/misc.js
@@ -53,11 +53,50 @@ module.exports =
App.ServiceConfigModificationHandler.create({
filename : 'hdfs-site.xml'
});
}
+} else if (changedConfig.get(name) == yarn_user) {
+ curConfigs = allConfigs.findProperty('serviceName',
'YARN').get('configs');
+ var currentUsers,
+ currentGroups;
+ var initialUser = changedConfig.get('initialValue');
+ var newUser = newValue;
+ var currentAclValue = curConfigs.findProperty(name,
yarn.admin.acl).get(value);
+ var currentAclValueSplits =
$.trim(currentAclValue).split(/\s+/).filter(function(i) { return
!Em.isEmpty(i); });
+ if (currentAclValueSplits.length == 2) {
+currentUsers = currentAclValueSplits[0];
+currentGroups = currentAclValueSplits[1];
+ } else {
+currentUsers = currentAclValueSplits.length 0 ?
currentAclValueSplits.shift() : ''
+currentGroups = currentAclValueSplits.join( );
+ }
+ var currentUserList = currentUsers.split(',').filter(function(i) {
return !Em.isEmpty(i); });
+ if (!currentUserList.contains(newUser)) {
+var currentUserIndex = currentUserList.indexOf(initialUser);
+if (currentUserIndex -1) {
+ currentUserList.splice(currentUserIndex, 1);
+}
+if (!currentUserList.contains(newUser)) {
+ currentUserList.push(newUser);
+}
+var newAclValue = $.trim(currentUserList.join(',') + ' ' +
currentGroups);
+if (currentAclValue != newAclValue) {
+ affectedProperties.push({
+serviceName : YARN,
+sourceServiceName : MISC,
[1/2] ambari git commit: AMBARI-11748. 'hbase.region.server.rpc.scheduler.factory.class' has been misspelt (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk c33b8ee26 - b2cb50885
AMBARI-11748. 'hbase.region.server.rpc.scheduler.factory.class' has been
misspelt (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e202aaa8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e202aaa8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e202aaa8
Branch: refs/heads/trunk
Commit: e202aaa850e5b176160ed6a3b496341b83483448
Parents: c33b8ee
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Fri Jun 5 19:08:20 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Fri Jun 5 19:23:12 2015 -0700
--
.../stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml | 2 +-
ambari-web/app/data/HDP2.2/site_properties.js| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e202aaa8/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
index 429b763..382608e 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
@@ -126,7 +126,7 @@
/depends-on
/property
property
-namehbase.regionserver.rpc.scheduler.factory.class/name
+namehbase.region.server.rpc.scheduler.factory.class/name
value/value
depends-on
property
http://git-wip-us.apache.org/repos/asf/ambari/blob/e202aaa8/ambari-web/app/data/HDP2.2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js
b/ambari-web/app/data/HDP2.2/site_properties.js
index f4be8c7..f81cb0c 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -908,8 +908,8 @@ hdp22properties.push(
},
{
id: site property,
-name: hbase.regionserver.rpc.scheduler.factory.class,
-displayName: hbase.regionserver.rpc.scheduler.factory.class,
+name: hbase.region.server.rpc.scheduler.factory.class,
+displayName: hbase.region.server.rpc.scheduler.factory.class,
defaultValue: ,
isRequired: false,
category: Advanced hbase-site,
ambari git commit: AMBARI-11732. The properties listed in Atlas configuration panels of Ambari UI differed in name than actual property names in configuration files (Jon Marin via smohanty)
Repository: ambari Updated Branches: refs/heads/trunk e973a534f - fdaa98043 AMBARI-11732. The properties listed in Atlas configuration panels of Ambari UI differed in name than actual property names in configuration files (Jon Marin via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fdaa9804 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fdaa9804 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fdaa9804 Branch: refs/heads/trunk Commit: fdaa98043ffbd3b6322c8a68e9d8417cf5b450af Parents: e973a53 Author: Sumit Mohanty smoha...@hortonworks.com Authored: Fri Jun 5 19:03:11 2015 -0700 Committer: Sumit Mohanty smoha...@hortonworks.com Committed: Fri Jun 5 19:03:11 2015 -0700 -- .../configuration/application-properties.xml| 109 +-- .../ATLAS/0.1.0.2.3/kerberos.json | 12 +- .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 6 +- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 11 +- .../stacks/2.3/ATLAS/test_metadata_server.py| 11 +- .../test/python/stacks/2.3/configs/default.json | 43 6 files changed, 66 insertions(+), 126 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/fdaa9804/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml -- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml index 29f4e72..db5ffd1 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml @@ -20,172 +20,115 @@ -- configuration supports_final=false property -namegraph_storage_backend/name +namemetadata.graph.storage.backend/name valueberkeleyje/value description/description /property property -namegraph_storage_directory/name +namemetadata.graph.storage.directory/name value/var/lib/atlas/data/berkeley/value description/description /property property -namegraph_index_search_backend/name +namemetadata.graph.index.search.backend/name valueelasticsearch/value description/description /property property -namegraph_index_search_directory/name +namemetadata.graph.index.search.directory/name value/var/lib/atlas/data/es/value description/description /property property -namegraph_index_search_elasticsearch_client_only/name +namemetadata.graph.index.search.elasticsearch.client-only/name valuefalse/value description/description /property property -namegraph_index_search_elasticsearch_local_mode/name +namemetadata.graph.index.search.elasticsearch.local-mode/name valuetrue/value description/description /property property -namelineage_hive_table_type_name/name +namemetadata.lineage.hive.table.type.name/name valueTable/value description/description /property property -namelineage_hive_column_type_name/name +namemetadata.lineage.hive.column.type.name/name valueColumn/value description/description /property property -namelineage_hive_table_column_name/name +namemetadata.lineage.hive.table.column.name/name valuecolumns/value description/description /property property -namelineage_hive_process_type_name/name +namemetadata.lineage.hive.process.type.name/name valueLoadProcess/value description/description /property property -namelineage_hive_process_inputs_name/name +namemetadata.lineage.hive.process.inputs.name/name valueinputTables/value description/description /property property -namelineage_hive_process_outputs_name/name +namemetadata.lineage.hive.process.outputs.name/name valueoutputTables/value description/description /property property -nameenableTLS/name +namemetadata.enableTLS/name valuefalse/value description/description /property property -nameauthentication_method/name +namemetadata.authentication.method/name valuesimple/value description/description /property property -nameauthentication_principal/name +namemetadata.authentication.principal/name valueatlas/value description/description /property property -nameauthentication_keytab/name +namemetadata.authentication.keytab/name value/etc/security/keytabs/atlas.service.keytab/value description/description /property property -
