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 2013/11/07 13:29:09 UTC
git commit: AMBARI-3712. Web UI incorectly shows host as 'Heartbeat
lost' or 'slaves down' after closing add host wizard. (akovalenko)
Updated Branches:
refs/heads/trunk da607636e -> ff58adac8
AMBARI-3712. Web UI incorectly shows host as 'Heartbeat lost' or 'slaves down' after closing add host wizard. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/ff58adac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/ff58adac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/ff58adac
Branch: refs/heads/trunk
Commit: ff58adac85fb43aeec9bf7d291ecc6297ee83bc8
Parents: da60763
Author: Aleksandr Kovalenko <ol...@ukr.net>
Authored: Thu Nov 7 14:27:41 2013 +0200
Committer: Aleksandr Kovalenko <ol...@ukr.net>
Committed: Thu Nov 7 14:27:41 2013 +0200
----------------------------------------------------------------------
ambari-web/app/models/host.js | 2 +-
ambari-web/app/routes/add_host_routes.js | 4 ----
ambari-web/app/routes/add_service_routes.js | 4 ----
ambari-web/app/routes/reassign_master_routes.js | 4 ----
4 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ff58adac/ambari-web/app/models/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/host.js b/ambari-web/app/models/host.js
index 614d1ef..b1d6002 100644
--- a/ambari-web/app/models/host.js
+++ b/ambari-web/app/models/host.js
@@ -135,7 +135,7 @@ App.Host = DS.Model.extend({
'UNHEALTHY': 'health-status-DEAD-RED',
'ALERT ': 'health-status-DEAD-ORANGE'
};
- return statusMap[this.get('healthStatus')] || 'health-status-DEAD-ORANGE';
+ return statusMap[this.get('healthStatus')] || 'health-status-DEAD-YELLOW';
}.property('healthStatus'),
healthToolTip: function(){
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ff58adac/ambari-web/app/routes/add_host_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_host_routes.js b/ambari-web/app/routes/add_host_routes.js
index 8f6e5d9..f793d32 100644
--- a/ambari-web/app/routes/add_host_routes.js
+++ b/ambari-web/app/routes/add_host_routes.js
@@ -25,10 +25,6 @@ module.exports = Em.Route.extend({
Ember.run.next(function () {
var addHostController = router.get('addHostController');
App.router.get('updateController').set('isWorking', false);
- var hostsUrl = '/hosts?fields=Hosts/host_name,Hosts/disk_info,host_components';
- router.get('clusterController').requestHosts(hostsUrl, function () {
- console.log('Request for hosts, with disk_info parameter');
- });
App.ModalPopup.show({
classNames: ['full-width-modal'],
header:Em.I18n.t('hosts.add.header'),
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ff58adac/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index 16b113e..6c51356 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -27,10 +27,6 @@ module.exports = Em.Route.extend({
Em.run.next(function () {
var addServiceController = router.get('addServiceController');
App.router.get('updateController').set('isWorking', false);
- var hostsUrl = '/hosts?fields=Hosts/host_name,Hosts/disk_info,host_components';
- router.get('clusterController').requestHosts(hostsUrl, function () {
- console.log('Request for hosts, with disk_info parameter');
- });
var popup = App.ModalPopup.show({
classNames: ['full-width-modal'],
header:Em.I18n.t('services.add.header'),
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ff58adac/ambari-web/app/routes/reassign_master_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/reassign_master_routes.js b/ambari-web/app/routes/reassign_master_routes.js
index 8b97f9c..ffb217f 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -24,10 +24,6 @@ module.exports = Em.Route.extend({
Em.run.next(function () {
var reassignMasterController = router.get('reassignMasterController');
App.router.get('updateController').set('isWorking', false);
- var hostsUrl = '/hosts?fields=Hosts/host_name,Hosts/disk_info,host_components';
- router.get('clusterController').requestHosts(hostsUrl, function () {
- console.log('Request for hosts, with disk_info parameter');
- });
var popup = App.ModalPopup.show({
classNames: ['full-width-modal'],
header: Em.I18n.t('services.reassign.header'),