hadoop git commit: YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB.
Repository: hadoop Updated Branches: refs/heads/trunk b7613e0f4 -> ff7513235 YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ff751323 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ff751323 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ff751323 Branch: refs/heads/trunk Commit: ff7513235579bd9ff48d59127864ceb8eda3c509 Parents: b7613e0 Author: Sunil G Authored: Wed Feb 15 15:52:57 2017 +0530 Committer: Sunil G Committed: Wed Feb 15 15:52:57 2017 +0530 -- .../webapp/app/components/app-attempt-table.js | 9 - .../src/main/webapp/app/controllers/yarn-app.js | 6 +++--- .../src/main/webapp/app/models/yarn-app.js | 2 +- .../src/main/webapp/app/serializers/yarn-app.js | 6 +++--- .../src/main/webapp/app/styles/app.css | 20 ++-- .../webapp/app/templates/cluster-overview.hbs | 10 +- .../templates/components/app-attempt-table.hbs | 6 +++--- .../templates/components/container-table.hbs| 6 +++--- .../src/main/webapp/app/templates/yarn-app.hbs | 8 9 files changed, 44 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js index 4b741b8..3c43037 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js @@ -19,4 +19,11 @@ import Ember from 'ember'; export default Ember.Component.extend({ -}); \ No newline at end of file + nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', function() { +var nodeHttpAddress = this.get('attempt.nodeHttpAddress'); +if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) { + nodeHttpAddress = 'http://' + nodeHttpAddress; +} +return nodeHttpAddress; + }) +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js index 9c1cb5d..f699a22 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js @@ -35,11 +35,11 @@ export default Ember.Controller.extend({ }]; }), - amHostHttpAddressFormatted: function() { + amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() { var amHostAddress = this.get('model.app.amHostHttpAddress'); -if (amHostAddress.indexOf('http://') < 0) { +if (amHostAddress && amHostAddress.indexOf('://') < 0) { amHostAddress = 'http://' + amHostAddress; } return amHostAddress; - }.property('model.app.amHostHttpAddress') + }) }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js index 1366357..638e5b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js @@ -37,7 +37,7 @@ export default DS.Model.extend({ amNodeLabelExpression: DS.attr('string'), applicationTags: DS.attr('string'), applicationType: DS.attr('string'), - priority: DS.attr('number'), + priority: DS.attr('string'), allocatedMB: DS.attr('number'), allocatedVCores: DS.attr('number'), runningContainers: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/
[27/50] [abbrv] hadoop git commit: YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB.
YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/478de67f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/478de67f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/478de67f Branch: refs/heads/YARN-5355_branch2 Commit: 478de67f1be8e5cbbad93f513aa8dfef0f313f08 Parents: 850b84b Author: Sunil G Authored: Wed Feb 15 15:52:57 2017 +0530 Committer: vrushali Committed: Tue Oct 17 11:39:55 2017 -0700 -- .../webapp/app/components/app-attempt-table.js | 9 - .../src/main/webapp/app/controllers/yarn-app.js | 6 +++--- .../src/main/webapp/app/models/yarn-app.js | 2 +- .../src/main/webapp/app/serializers/yarn-app.js | 6 +++--- .../src/main/webapp/app/styles/app.css | 20 ++-- .../webapp/app/templates/cluster-overview.hbs | 10 +- .../templates/components/app-attempt-table.hbs | 6 +++--- .../templates/components/container-table.hbs| 6 +++--- .../src/main/webapp/app/templates/yarn-app.hbs | 8 9 files changed, 44 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/478de67f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js index 4b741b8..3c43037 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js @@ -19,4 +19,11 @@ import Ember from 'ember'; export default Ember.Component.extend({ -}); \ No newline at end of file + nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', function() { +var nodeHttpAddress = this.get('attempt.nodeHttpAddress'); +if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) { + nodeHttpAddress = 'http://' + nodeHttpAddress; +} +return nodeHttpAddress; + }) +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/478de67f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js index 9c1cb5d..f699a22 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js @@ -35,11 +35,11 @@ export default Ember.Controller.extend({ }]; }), - amHostHttpAddressFormatted: function() { + amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() { var amHostAddress = this.get('model.app.amHostHttpAddress'); -if (amHostAddress.indexOf('http://') < 0) { +if (amHostAddress && amHostAddress.indexOf('://') < 0) { amHostAddress = 'http://' + amHostAddress; } return amHostAddress; - }.property('model.app.amHostHttpAddress') + }) }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/478de67f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js index 1366357..638e5b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js @@ -37,7 +37,7 @@ export default DS.Model.extend({ amNodeLabelExpression: DS.attr('string'), applicationTags: DS.attr('string'), applicationType: DS.attr('string'), - priority: DS.attr('number'), + priority: DS.attr('string'), allocatedMB: DS.attr('number'), allocatedVCores: DS.attr('number'), runningContainers: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/hadoop/blob/478de67f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoo
[31/50] [abbrv] hadoop git commit: YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB.
YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/981ccd9d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/981ccd9d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/981ccd9d Branch: refs/heads/YARN-3368_branch2 Commit: 981ccd9d906c75226f0cee32ce935a59f071e257 Parents: 9071c71 Author: Sunil G Authored: Wed Feb 15 15:52:57 2017 +0530 Committer: Varun Saxena Committed: Wed Oct 18 02:06:48 2017 +0530 -- .../webapp/app/components/app-attempt-table.js | 9 - .../src/main/webapp/app/controllers/yarn-app.js | 6 +++--- .../src/main/webapp/app/models/yarn-app.js | 2 +- .../src/main/webapp/app/serializers/yarn-app.js | 6 +++--- .../src/main/webapp/app/styles/app.css | 20 ++-- .../webapp/app/templates/cluster-overview.hbs | 10 +- .../templates/components/app-attempt-table.hbs | 6 +++--- .../templates/components/container-table.hbs| 6 +++--- .../src/main/webapp/app/templates/yarn-app.hbs | 8 9 files changed, 44 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/981ccd9d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js index 4b741b8..3c43037 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js @@ -19,4 +19,11 @@ import Ember from 'ember'; export default Ember.Component.extend({ -}); \ No newline at end of file + nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', function() { +var nodeHttpAddress = this.get('attempt.nodeHttpAddress'); +if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) { + nodeHttpAddress = 'http://' + nodeHttpAddress; +} +return nodeHttpAddress; + }) +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/981ccd9d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js index 9c1cb5d..f699a22 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js @@ -35,11 +35,11 @@ export default Ember.Controller.extend({ }]; }), - amHostHttpAddressFormatted: function() { + amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() { var amHostAddress = this.get('model.app.amHostHttpAddress'); -if (amHostAddress.indexOf('http://') < 0) { +if (amHostAddress && amHostAddress.indexOf('://') < 0) { amHostAddress = 'http://' + amHostAddress; } return amHostAddress; - }.property('model.app.amHostHttpAddress') + }) }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/981ccd9d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js index 1366357..638e5b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js @@ -37,7 +37,7 @@ export default DS.Model.extend({ amNodeLabelExpression: DS.attr('string'), applicationTags: DS.attr('string'), applicationType: DS.attr('string'), - priority: DS.attr('number'), + priority: DS.attr('string'), allocatedMB: DS.attr('number'), allocatedVCores: DS.attr('number'), runningContainers: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/hadoop/blob/981ccd9d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/h
[10/50] [abbrv] hadoop git commit: YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB.
YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ff751323 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ff751323 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ff751323 Branch: refs/heads/HDFS-10285 Commit: ff7513235579bd9ff48d59127864ceb8eda3c509 Parents: b7613e0 Author: Sunil G Authored: Wed Feb 15 15:52:57 2017 +0530 Committer: Sunil G Committed: Wed Feb 15 15:52:57 2017 +0530 -- .../webapp/app/components/app-attempt-table.js | 9 - .../src/main/webapp/app/controllers/yarn-app.js | 6 +++--- .../src/main/webapp/app/models/yarn-app.js | 2 +- .../src/main/webapp/app/serializers/yarn-app.js | 6 +++--- .../src/main/webapp/app/styles/app.css | 20 ++-- .../webapp/app/templates/cluster-overview.hbs | 10 +- .../templates/components/app-attempt-table.hbs | 6 +++--- .../templates/components/container-table.hbs| 6 +++--- .../src/main/webapp/app/templates/yarn-app.hbs | 8 9 files changed, 44 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js index 4b741b8..3c43037 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js @@ -19,4 +19,11 @@ import Ember from 'ember'; export default Ember.Component.extend({ -}); \ No newline at end of file + nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', function() { +var nodeHttpAddress = this.get('attempt.nodeHttpAddress'); +if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) { + nodeHttpAddress = 'http://' + nodeHttpAddress; +} +return nodeHttpAddress; + }) +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js index 9c1cb5d..f699a22 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js @@ -35,11 +35,11 @@ export default Ember.Controller.extend({ }]; }), - amHostHttpAddressFormatted: function() { + amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() { var amHostAddress = this.get('model.app.amHostHttpAddress'); -if (amHostAddress.indexOf('http://') < 0) { +if (amHostAddress && amHostAddress.indexOf('://') < 0) { amHostAddress = 'http://' + amHostAddress; } return amHostAddress; - }.property('model.app.amHostHttpAddress') + }) }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js index 1366357..638e5b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js @@ -37,7 +37,7 @@ export default DS.Model.extend({ amNodeLabelExpression: DS.attr('string'), applicationTags: DS.attr('string'), applicationType: DS.attr('string'), - priority: DS.attr('number'), + priority: DS.attr('string'), allocatedMB: DS.attr('number'), allocatedVCores: DS.attr('number'), runningContainers: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoop-yarn-p
[14/50] [abbrv] hadoop git commit: YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB.
YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ff751323 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ff751323 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ff751323 Branch: refs/heads/YARN-5734 Commit: ff7513235579bd9ff48d59127864ceb8eda3c509 Parents: b7613e0 Author: Sunil G Authored: Wed Feb 15 15:52:57 2017 +0530 Committer: Sunil G Committed: Wed Feb 15 15:52:57 2017 +0530 -- .../webapp/app/components/app-attempt-table.js | 9 - .../src/main/webapp/app/controllers/yarn-app.js | 6 +++--- .../src/main/webapp/app/models/yarn-app.js | 2 +- .../src/main/webapp/app/serializers/yarn-app.js | 6 +++--- .../src/main/webapp/app/styles/app.css | 20 ++-- .../webapp/app/templates/cluster-overview.hbs | 10 +- .../templates/components/app-attempt-table.hbs | 6 +++--- .../templates/components/container-table.hbs| 6 +++--- .../src/main/webapp/app/templates/yarn-app.hbs | 8 9 files changed, 44 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js index 4b741b8..3c43037 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js @@ -19,4 +19,11 @@ import Ember from 'ember'; export default Ember.Component.extend({ -}); \ No newline at end of file + nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', function() { +var nodeHttpAddress = this.get('attempt.nodeHttpAddress'); +if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) { + nodeHttpAddress = 'http://' + nodeHttpAddress; +} +return nodeHttpAddress; + }) +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js index 9c1cb5d..f699a22 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js @@ -35,11 +35,11 @@ export default Ember.Controller.extend({ }]; }), - amHostHttpAddressFormatted: function() { + amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() { var amHostAddress = this.get('model.app.amHostHttpAddress'); -if (amHostAddress.indexOf('http://') < 0) { +if (amHostAddress && amHostAddress.indexOf('://') < 0) { amHostAddress = 'http://' + amHostAddress; } return amHostAddress; - }.property('model.app.amHostHttpAddress') + }) }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js index 1366357..638e5b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js @@ -37,7 +37,7 @@ export default DS.Model.extend({ amNodeLabelExpression: DS.attr('string'), applicationTags: DS.attr('string'), applicationType: DS.attr('string'), - priority: DS.attr('number'), + priority: DS.attr('string'), allocatedMB: DS.attr('number'), allocatedVCores: DS.attr('number'), runningContainers: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoop-yarn-pr
[09/50] [abbrv] hadoop git commit: YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB.
YARN-6183. Few missing informations in Application and Application Attempt pages for new YARN UI. Contributed by Akhil PB. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ff751323 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ff751323 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ff751323 Branch: refs/heads/HADOOP-13345 Commit: ff7513235579bd9ff48d59127864ceb8eda3c509 Parents: b7613e0 Author: Sunil G Authored: Wed Feb 15 15:52:57 2017 +0530 Committer: Sunil G Committed: Wed Feb 15 15:52:57 2017 +0530 -- .../webapp/app/components/app-attempt-table.js | 9 - .../src/main/webapp/app/controllers/yarn-app.js | 6 +++--- .../src/main/webapp/app/models/yarn-app.js | 2 +- .../src/main/webapp/app/serializers/yarn-app.js | 6 +++--- .../src/main/webapp/app/styles/app.css | 20 ++-- .../webapp/app/templates/cluster-overview.hbs | 10 +- .../templates/components/app-attempt-table.hbs | 6 +++--- .../templates/components/container-table.hbs| 6 +++--- .../src/main/webapp/app/templates/yarn-app.hbs | 8 9 files changed, 44 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js index 4b741b8..3c43037 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js @@ -19,4 +19,11 @@ import Ember from 'ember'; export default Ember.Component.extend({ -}); \ No newline at end of file + nodeHttpAddressFormatted: Ember.computed('attempt.nodeHttpAddress', function() { +var nodeHttpAddress = this.get('attempt.nodeHttpAddress'); +if (nodeHttpAddress && nodeHttpAddress.indexOf('://') < 0) { + nodeHttpAddress = 'http://' + nodeHttpAddress; +} +return nodeHttpAddress; + }) +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js index 9c1cb5d..f699a22 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js @@ -35,11 +35,11 @@ export default Ember.Controller.extend({ }]; }), - amHostHttpAddressFormatted: function() { + amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function() { var amHostAddress = this.get('model.app.amHostHttpAddress'); -if (amHostAddress.indexOf('http://') < 0) { +if (amHostAddress && amHostAddress.indexOf('://') < 0) { amHostAddress = 'http://' + amHostAddress; } return amHostAddress; - }.property('model.app.amHostHttpAddress') + }) }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js index 1366357..638e5b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js @@ -37,7 +37,7 @@ export default DS.Model.extend({ amNodeLabelExpression: DS.attr('string'), applicationTags: DS.attr('string'), applicationType: DS.attr('string'), - priority: DS.attr('number'), + priority: DS.attr('string'), allocatedMB: DS.attr('number'), allocatedVCores: DS.attr('number'), runningContainers: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/hadoop/blob/ff751323/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoop-yarn