This is an automated email from the ASF dual-hosted git repository.
ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 22adaed AMBARI-23302 Ambari Upgrade from 2.6.0.0 - 2.7.0.0 -
Dashboard is unable to load and spinner keeps spinning. (ababiichuk)
22adaed is described below
commit 22adaedc021218c2af91ee9b40aec7eb4483b140
Author: ababiichuk <[email protected]>
AuthorDate: Tue Mar 20 15:55:59 2018 +0200
AMBARI-23302 Ambari Upgrade from 2.6.0.0 - 2.7.0.0 - Dashboard is unable to
load and spinner keeps spinning. (ababiichuk)
---
ambari-web/app/controllers/global/cluster_controller.js | 1 +
ambari-web/app/controllers/global/update_controller.js | 2 +-
ambari-web/app/mappers/service_metrics_mapper.js | 2 +-
ambari-web/app/views/main/dashboard/widgets/namenode_cpu.js | 2 +-
ambari-web/test/views/main/dashboard/widgets_test.js | 3 ++-
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ambari-web/app/controllers/global/cluster_controller.js
b/ambari-web/app/controllers/global/cluster_controller.js
index 5dfda04..349a73c 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -254,6 +254,7 @@ App.ClusterController =
Em.Controller.extend(App.ReloadPopupMixin, {
// make second call, because first is light since it doesn't request
host-component metrics
updater.updateServiceMetric(function() {
self.set('isHostComponentMetricsLoaded', true);
+ updater.updateHDFSNameSpaces();
});
// components config loading doesn't affect overall progress
self.loadComponentWithStaleConfigs(function () {
diff --git a/ambari-web/app/controllers/global/update_controller.js
b/ambari-web/app/controllers/global/update_controller.js
index 40fadc1..620d6a8 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -685,7 +685,7 @@ App.UpdateController = Em.Controller.extend({
},
updateHDFSNameSpaces: function () {
- if (App.Service.find().someProperty('serviceName', 'HDFS')) {
+ if (App.Service.find().someProperty('serviceName', 'HDFS') &&
App.get('isHaEnabled')) {
const siteName = 'hdfs-site',
storedHdfsSiteconfigs = App.db.getConfigs().findProperty('type',
siteName),
tagName = storedHdfsSiteconfigs && storedHdfsSiteconfigs.tag;
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js
b/ambari-web/app/mappers/service_metrics_mapper.js
index ddf03f2..d8c060f 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -543,7 +543,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
});
} else {
activeNameNodeConfigKeys.forEach(key => {
- item[key].default = Em.get(firstHostComponent,
activeNameNodeConfigKeys[key]);
+ item[key].default = Em.get(firstHostComponent,
activeNameNodeConfig[key]);
});
}
diff --git a/ambari-web/app/views/main/dashboard/widgets/namenode_cpu.js
b/ambari-web/app/views/main/dashboard/widgets/namenode_cpu.js
index 394559d..3cac94e 100644
--- a/ambari-web/app/views/main/dashboard/widgets/namenode_cpu.js
+++ b/ambari-web/app/views/main/dashboard/widgets/namenode_cpu.js
@@ -39,7 +39,7 @@ App.NameNodeCpuPieChartView =
App.PieChartDashboardWidgetView.extend(App.NameNod
this.set('nnHostName', nn.get('hostName'));
}
} else {
- this.set('nnHostName', self.get('model.nameNode.hostName'));
+ this.set('nnHostName', this.get('model.nameNode.hostName'));
}
if (this.get('nnHostName')) {
this.getValue();
diff --git a/ambari-web/test/views/main/dashboard/widgets_test.js
b/ambari-web/test/views/main/dashboard/widgets_test.js
index 54931a1..280c8a5 100644
--- a/ambari-web/test/views/main/dashboard/widgets_test.js
+++ b/ambari-web/test/views/main/dashboard/widgets_test.js
@@ -34,7 +34,8 @@ describe('App.MainDashboardWidgetsView', function () {
setDBProperty: Em.K,
persistKey: 'key',
widgetGroupsDeferred: {
- done: Em.clb
+ done: Em.clb,
+ resolve: Em.K
}
});
});
--
To stop receiving notification emails like this one, please contact
[email protected].
