diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js index 7a0fc4a..17a5a4d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js @@ -25,10 +25,11 @@ export default AbstractAdapter.extend({ serverName: "NM", urlForFindRecord(id, modelName, snapshot) { - var extension = this.get("host").split('/').pop(); - if (extension != id) { - this.host = this.get("host") + id; - } + var address = this.get('address'); + var host = this.get(`hosts.${address}`) + id; + var nodeNamespace = this.get('env.app.namespaces.node'); + this.set('host', host); + this.set('namespace', nodeNamespace); var url = this._buildURL(); return url; }, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js index 5945813..3dfd776 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js @@ -68,7 +68,7 @@ export default DS.JSONAPISerializer.extend({ // expected return response is of the form { data: [ {}, {} ] } var normalizedArrayResponse = {}; // payload is of the form { "apps" : { "app": [ {},{},{} ] } } - if (payload.apps) { + if (payload.apps && payload.apps.app) { normalizedArrayResponse.data = payload.apps.app.map(singleApp => { return this.internalNormalizeSingleResponse(store, primaryModelClass, singleApp); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js index a104f1e..bf19ad7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js @@ -54,7 +54,7 @@ export default DS.JSONAPISerializer.extend({ requestType) { // expected return response is of the form { data: [ {}, {} ] } var normalizedArrayResponse = {}; - if (payload.containers) { + if (payload.containers && payload.containers.container) { // payload is of the form { "containers" : { "container": [ {},{},{} ] } } normalizedArrayResponse.data = payload.containers.container.map(singleContainer => {