You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2018/05/23 17:13:02 UTC
[14/18] hadoop git commit: YARN-8297. Incorrect ATS Url used for Wire
encrypted cluster.(addendum). Contributed by Sunil G.
YARN-8297. Incorrect ATS Url used for Wire encrypted cluster.(addendum). Contributed by Sunil G.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f61e3e75
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f61e3e75
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f61e3e75
Branch: refs/heads/HDDS-48
Commit: f61e3e752eb1cf4a08030da04bc3d6c5a2b3926d
Parents: 9837ca9
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Wed May 23 18:31:03 2018 +0530
Committer: Rohith Sharma K S <ro...@apache.org>
Committed: Wed May 23 18:31:03 2018 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/initializers/loader.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f61e3e75/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
index 53f9c44..01daa7a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -31,7 +31,7 @@ function getYarnHttpProtocolScheme(rmhost, application) {
$.ajax({
type: 'GET',
dataType: 'json',
- async: true,
+ async: false,
context: this,
url: httpUrl,
success: function(data) {
@@ -44,7 +44,7 @@ function getYarnHttpProtocolScheme(rmhost, application) {
application.advanceReadiness();
}
});
- return protocolScheme == "HTTPS_ONLY";
+ return protocolScheme;
}
function getTimeLineURL(rmhost, isHttpsSchemeEnabled) {
@@ -97,7 +97,9 @@ function updateConfigs(application) {
Ember.Logger.log("RM Address: " + rmhost);
- var isHttpsSchemeEnabled = getYarnHttpProtocolScheme(rmhost, application);
+ var protocolSchemeFromRM = getYarnHttpProtocolScheme(rmhost, application);
+ Ember.Logger.log("Is protocol scheme https? " + (protocolSchemeFromRM == "HTTPS_ONLY"));
+ var isHttpsSchemeEnabled = (protocolSchemeFromRM == "HTTPS_ONLY");
if(!ENV.hosts.timelineWebAddress) {
var timelinehost = "";
$.ajax({
@@ -137,7 +139,7 @@ function updateConfigs(application) {
$.ajax({
type: 'GET',
dataType: 'json',
- async: true,
+ async: false,
context: this,
url: getTimeLineV1URL(rmhost, isHttpsSchemeEnabled),
success: function(data) {
@@ -171,7 +173,7 @@ function updateConfigs(application) {
$.ajax({
type: 'GET',
dataType: 'json',
- async: true,
+ async: false,
context: this,
url: getSecurityURL(rmhost),
success: function(data) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org