You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2016/06/23 11:04:38 UTC
ambari git commit: AMBARI-17378 No data for Disk Usage and Load Avg
after sorting (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 4ed6a3d22 -> 390e56132
AMBARI-17378 No data for Disk Usage and Load Avg after sorting (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/390e5613
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/390e5613
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/390e5613
Branch: refs/heads/trunk
Commit: 390e5613260b79be4f00529e100ba7c165eeee7c
Parents: 4ed6a3d
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Jun 22 20:07:29 2016 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Thu Jun 23 14:03:22 2016 +0300
----------------------------------------------------------------------
ambari-web/app/mappers/hosts_mapper.js | 20 +++++++++-----------
ambari-web/app/views/main/host.js | 1 -
ambari-web/test/mappers/hosts_mapper_test.js | 23 ++++++++---------------
3 files changed, 17 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/390e5613/ambari-web/app/mappers/hosts_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/hosts_mapper.js b/ambari-web/app/mappers/hosts_mapper.js
index 919ce77..6850242 100644
--- a/ambari-web/app/mappers/hosts_mapper.js
+++ b/ambari-web/app/mappers/hosts_mapper.js
@@ -189,7 +189,7 @@ App.hostsMapper = App.QuickDataMapper.create({
}
});
var parsedItem = this.parseIt(item, this.config);
- parsedItem.is_requested = true;
+
parsedItem.last_heart_beat_time = App.dateTimeWithTimeZone(parsedItem.last_heart_beat_time);
parsedItem.selected = selectedHosts.contains(parsedItem.host_name);
parsedItem.not_started_components = notStartedComponents;
@@ -237,16 +237,14 @@ App.hostsMapper = App.QuickDataMapper.create({
*/
setMetrics: function (data) {
var hosts = this.get('model').find();
- for (var i = 0; i < hosts.length; i++) {
- var host = hosts[i];
- if (host.get('isRequested')) {
- var hostMetrics = data.items.findProperty('Hosts.host_name', host.get('hostName'));
- host.setProperties({
- diskTotal: Em.get(hostMetrics, 'metrics.disk.disk_total'),
- diskFree: Em.get(hostMetrics, 'metrics.disk.disk_free'),
- loadOne: Em.get(hostMetrics, 'metrics.load.load_one')
- });
- }
+ for (var i = 0; i < hosts.content.length; i++) {
+ var host = hosts.objectAt(i);
+ var hostMetrics = data.items.findProperty('Hosts.host_name', host.get('hostName'));
+ host.setProperties({
+ diskTotal: Em.get(hostMetrics, 'metrics.disk.disk_total'),
+ diskFree: Em.get(hostMetrics, 'metrics.disk.disk_free'),
+ loadOne: Em.get(hostMetrics, 'metrics.load.load_one')
+ });
}
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/390e5613/ambari-web/app/views/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host.js b/ambari-web/app/views/main/host.js
index 0a0e9fa..fd4e085 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -52,7 +52,6 @@ App.MainHostView = App.TableView.extend(App.TableServerViewMixin, {
onRequestErrorHandler: function() {
this.set('requestError', null);
- this.get('controller').get('dataSource').setEach('isRequested', false);
this.set('filteringComplete', true);
this.propertyDidChange('pageContent');
}.observes('requestError'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/390e5613/ambari-web/test/mappers/hosts_mapper_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mappers/hosts_mapper_test.js b/ambari-web/test/mappers/hosts_mapper_test.js
index 1d7d80a..5d082e3 100644
--- a/ambari-web/test/mappers/hosts_mapper_test.js
+++ b/ambari-web/test/mappers/hosts_mapper_test.js
@@ -49,28 +49,21 @@ describe('App.hostsMapper', function () {
});
it("Host not in the model", function() {
var host = Em.Object.create({
- hostName: 'host2',
- isRequested: true
+ hostName: 'host2'
});
- this.mock.returns([host]);
- mapper.setMetrics(data);
- expect(host.get('loadOne')).to.be.undefined;
- });
- it("Host not in the filter", function() {
- var host = Em.Object.create({
- hostName: 'host1',
- isRequested: false
- });
- this.mock.returns([host]);
+ var mockedModel = [host];
+ mockedModel.content = mockedModel;
+ this.mock.returns(mockedModel);
mapper.setMetrics(data);
expect(host.get('loadOne')).to.be.undefined;
});
it("Host should have updated metrics", function() {
var host = Em.Object.create({
- hostName: 'host1',
- isRequested: true
+ hostName: 'host1'
});
- this.mock.returns([host]);
+ var mockedModel = [host];
+ mockedModel.content = mockedModel;
+ this.mock.returns(mockedModel);
mapper.setMetrics(data);
expect(host.get('loadOne')).to.equal(1);
});