You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by is...@apache.org on 2018/08/10 18:19:30 UTC
[ambari] branch branch-2.7 updated (6385622 -> cf3ec0c)
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a change to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git.
from 6385622 AMBARI-24457. Hiveserver2 can't connect to metastore when using OneFS (amagyar) (#2024) (#2028)
new e0af328 AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
new 704342f AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
new ce50c1a AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
new 585f307 AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
new 5c9c386 AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
new cf3ec0c [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN conf… (#2016)
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../common/configs/config_recommendation_parser.js | 53 ++++++++++++++++++++--
ambari-web/app/views/common/controls_view.js | 1 -
2 files changed, 50 insertions(+), 4 deletions(-)
[ambari] 05/06: AMBARI-24246. Ambari does not pick the existing
hive database from the jdbc url set
Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 5c9c386565ffd8a4b96c6c2ea0a56a47be19f86d
Author: Alex Antonenko <aa...@hortonworks.com>
AuthorDate: Thu Jul 12 15:05:49 2018 +0300
AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
---
ambari-web/app/mixins/common/configs/config_recommendation_parser.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 7d18574..74aeacd 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -158,7 +158,7 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
fileName = Em.get(config, 'filename'),
group = Em.get(config, 'group.name'),
value = Em.get(config, 'value'),
- prevRecommeneded = config.get('recommendedValue');
+ prevRecommeneded = Em.get(config, 'recommendedValue');
Em.set(config, 'recommendedValue', recommendedValue);
if (this.allowUpdateProperty(parentProperties, name, fileName, group, value)) {
var allowConfigUpdate = true;
[ambari] 02/06: AMBARI-24246. Ambari does not pick the existing
hive database from the jdbc url set
Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 704342f10da431b783164f74a99c7e2dd34cf398
Author: hiveww <hi...@gmail.com>
AuthorDate: Thu Jul 12 13:49:18 2018 +0300
AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
---
.../app/mixins/common/configs/config_recommendation_parser.js | 9 ++++++---
ambari-web/app/views/common/controls_view.js | 8 --------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index fcaf6f0..4d88c00 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -55,7 +55,6 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
App.assertFunction(updateCallback);
App.assertFunction(removeCallback);
App.assertFunction(updateBoundariesCallback);
-
var propertiesToDelete = [];
configs.forEach(function (config) {
var name = Em.get(config, 'name'),
@@ -158,9 +157,10 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
var name = Em.get(config, 'name'),
fileName = Em.get(config, 'filename'),
group = Em.get(config, 'group.name'),
- value = Em.get(config, 'value');
-
+ value = Em.get(config, 'value'),
+ prevRecommeneded = config.get('recommendedValue');
Em.set(config, 'recommendedValue', recommendedValue);
+ console.log('test123', config, recommendedValue)
if (this.allowUpdateProperty(parentProperties, name, fileName, group, value)) {
var allowConfigUpdate = true;
// workaround for capacity-scheduler
@@ -170,6 +170,9 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
allowConfigUpdate = false;
}
}
+ if (prevRecommeneded !== config.get('value')) {
+ allowConfigUpdate = false;
+ }
if (allowConfigUpdate) {
Em.setProperties(config, {
value: recommendedValue,
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index b41026b..2c3c4d8 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -113,14 +113,6 @@ App.SupportsDependentConfigs = Ember.Mixin.create({
}]);
}
}
-
- //Fix required by QA (Ambari does not pick the existing hive database from the jdbc url set)
- if (['oozie.service.JPAService.jdbc.url__oozie-site', 'javax.jdo.option.ConnectionURL__hive-site'].contains(config.get('id'))) {
- controller.set('recommendationsInProgress', true);
- controller.runServerSideValidation().done(function () {
- controller.set('recommendationsInProgress', false)
- });
- }
return $.Deferred().resolve().promise();
},
[ambari] 01/06: AMBARI-24246. Ambari does not pick the existing
hive database from the jdbc url set
Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit e0af328c569ca6c6aa3d54e787badc06a96b5930
Author: Alex Antonenko <aa...@hortonworks.com>
AuthorDate: Thu Jul 5 12:17:44 2018 +0300
AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
---
ambari-web/app/views/common/controls_view.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index 50b4d63..b41026b 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -114,6 +114,13 @@ App.SupportsDependentConfigs = Ember.Mixin.create({
}
}
+ //Fix required by QA (Ambari does not pick the existing hive database from the jdbc url set)
+ if (['oozie.service.JPAService.jdbc.url__oozie-site', 'javax.jdo.option.ConnectionURL__hive-site'].contains(config.get('id'))) {
+ controller.set('recommendationsInProgress', true);
+ controller.runServerSideValidation().done(function () {
+ controller.set('recommendationsInProgress', false)
+ });
+ }
return $.Deferred().resolve().promise();
},
[ambari] 04/06: AMBARI-24246. Ambari does not pick the existing
hive database from the jdbc url set
Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 585f307ffdd3624645355b1cc7cf21e497238458
Author: hiveww <hi...@gmail.com>
AuthorDate: Thu Jul 12 13:55:39 2018 +0300
AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
---
ambari-web/app/mixins/common/configs/config_recommendation_parser.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index cd18159..7d18574 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -160,7 +160,6 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
value = Em.get(config, 'value'),
prevRecommeneded = config.get('recommendedValue');
Em.set(config, 'recommendedValue', recommendedValue);
- console.log('test123', config, recommendedValue)
if (this.allowUpdateProperty(parentProperties, name, fileName, group, value)) {
var allowConfigUpdate = true;
// workaround for capacity-scheduler
[ambari] 03/06: AMBARI-24246. Ambari does not pick the existing
hive database from the jdbc url set
Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit ce50c1a72afbb50be29613305ebe3c3dfdc2ebe1
Author: hiveww <hi...@gmail.com>
AuthorDate: Thu Jul 12 13:53:58 2018 +0300
AMBARI-24246. Ambari does not pick the existing hive database from the jdbc url set
---
ambari-web/app/mixins/common/configs/config_recommendation_parser.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 4d88c00..cd18159 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -170,7 +170,7 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
allowConfigUpdate = false;
}
}
- if (prevRecommeneded !== config.get('value')) {
+ if (prevRecommeneded !== value) {
allowConfigUpdate = false;
}
if (allowConfigUpdate) {
[ambari] 06/06: [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN conf… (#2016)
Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit cf3ec0c543681387f2bfeec7a921207d1fcbc6d7
Author: Ishan Bhatt <is...@gmail.com>
AuthorDate: Thu Aug 9 17:12:07 2018 -0700
[AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN conf… (#2016)
* [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs while enabling HSI.
* Changed function parameters info
---
.../common/configs/config_recommendation_parser.js | 45 ++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 74aeacd..19ea8a5 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -169,9 +169,15 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
allowConfigUpdate = false;
}
}
+
if (prevRecommeneded !== value) {
allowConfigUpdate = false;
}
+
+ if (name === "capacity-scheduler") {
+ allowConfigUpdate = this.compareCapacitySchedulerValues(prevRecommeneded, value);
+ }
+
if (allowConfigUpdate) {
Em.setProperties(config, {
value: recommendedValue,
@@ -192,6 +198,45 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
},
/**
+ * Configs with value across multiple lines could have them in a different order
+ * Eg: capacity-scheduler
+ *
+ * @param {String} prevRec
+ * @param {String} value
+ * @returns {Boolean}
+ * @method isPrevRecAndValueEqual
+ */
+
+ compareCapacitySchedulerValues: function (prevRec, value) {
+
+
+ let prevRecArr = prevRec.split("\n");
+ let valueArr = value.split("\n");
+
+ //first value being added is capacity-scheduler=null. Remove that for comparison
+ if (valueArr[0].includes("capacity-scheduler")) {
+ valueArr = valueArr.splice(1);
+ }
+
+ if (prevRecArr.length !== valueArr.length) {
+ return false;
+ }
+ if (prevRecArr.length < 2 || valueArr.length < 2) {
+ return prevRec === value;
+ }
+ let strMap = {};
+ for (var i=0; i <prevRecArr.length; i++) {
+ strMap[prevRecArr[i]] = true;
+ }
+ for (var i=0; i<valueArr.length; i++) {
+ if (!strMap[valueArr[i]]) {
+ return false;
+ }
+ }
+ return true;
+ },
+
+ /**
* Add config based on recommendations
*
* @param name