This is an automated email from the ASF dual-hosted git repository.
siyao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new d50a9dd894 HDDS-7550. Recon: UI sorting not functioning as expected
(#4009)
d50a9dd894 is described below
commit d50a9dd894d40fcc1c37fd2e45ecd5cdba069083
Author: smitajoshi12 <[email protected]>
AuthorDate: Wed Dec 7 00:09:35 2022 +0530
HDDS-7550. Recon: UI sorting not functioning as expected (#4009)
---
.../webapps/recon/ozone-recon-web/api/db.json | 92 +++++++++++-----------
.../src/views/datanodes/datanodes.tsx | 10 +--
2 files changed, 51 insertions(+), 51 deletions(-)
diff --git
a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/api/db.json
b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/api/db.json
index 8fe3baf976..8bd9680ccd 100644
---
a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/api/db.json
+++
b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/api/db.json
@@ -18,7 +18,7 @@
"totalCount": 12,
"datanodes": [
{
- "hostname": "localhost1.storage.enterprise.com",
+ "hostname": "localhost2.storage.enterprise.com",
"uuid": "b590734e-a5f2-11ea-bb37-0242ac130002",
"state": "HEALTHY",
"opState": "IN_SERVICE",
@@ -51,7 +51,7 @@
"buildDate": "2020-07-20T15:45Z"
},
{
- "hostname": "localhost2.storage.enterprise.com",
+ "hostname": "localhost1.storage.enterprise.com",
"uuid": "b5907812-a5f2-11ea-bb37-0242ac130002",
"state": "HEALTHY",
"opState": "DECOMMISSIONING",
@@ -66,7 +66,7 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost1.storage.enterprise.com"
+ "leaderNode": "localhost2.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
@@ -84,7 +84,7 @@
"buildDate": "2020-07-20T15:45Z"
},
{
- "hostname": "localhost3.storage.enterprise.com",
+ "hostname": "localhost4.storage.enterprise.com",
"uuid": "b5907812-a5f2-11ea-bb37-0242ac130002",
"state": "HEALTHY",
"opState": "DECOMMISSIONED",
@@ -99,13 +99,13 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost1.storage.enterprise.com"
+ "leaderNode": "localhost3.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost2.storage.enterprise.com"
+ "leaderNode": "localhost3.storage.enterprise.com"
}
],
"containers": 8192,
@@ -117,7 +117,7 @@
"buildDate": "2020-07-20T15:45Z"
},
{
- "hostname": "localhost4.storage.enterprise.com",
+ "hostname": "localhost3.storage.enterprise.com",
"uuid": "b5907812-a5f2-11ea-bb37-0242ac130002",
"state": "HEALTHY",
"opState": "ENTERING_MAINTENANCE",
@@ -132,13 +132,13 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost1.storage.enterprise.com"
+ "leaderNode": "localhost4.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost2.storage.enterprise.com"
+ "leaderNode": "localhost4.storage.enterprise.com"
}
],
"containers": 8192,
@@ -150,7 +150,7 @@
"buildDate": "2020-07-20T15:45Z"
},
{
- "hostname": "localhost5.storage.enterprise.com",
+ "hostname": "localhost6.storage.enterprise.com",
"uuid": "b5907812-a5f2-11ea-bb37-0242ac130002",
"state": "HEALTHY",
"opState": "IN_MAINTENANCE",
@@ -165,13 +165,13 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost1.storage.enterprise.com"
+ "leaderNode": "localhost5.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost2.storage.enterprise.com"
+ "leaderNode": "localhost5.storage.enterprise.com"
}
],
"containers": 8192,
@@ -183,7 +183,7 @@
"buildDate": "2020-07-20T15:45Z"
},
{
- "hostname": "localhost6.storage.enterprise.com",
+ "hostname": "localhost5.storage.enterprise.com",
"uuid": "b5907934-a5f2-11ea-bb37-0242ac130002",
"state": "STALE",
"opState": "IN_SERVICE",
@@ -198,19 +198,19 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost1.storage.enterprise.com"
+ "leaderNode": "localhost6.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost6.storage.enterprise.com"
},
{
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "STAND_ALONE",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost6.storage.enterprise.com"
}
],
"containers": 43,
@@ -237,19 +237,19 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost1.storage.enterprise.com"
+ "leaderNode": "localhost7.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost7.storage.enterprise.com"
},
{
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "STAND_ALONE",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost7.storage.enterprise.com"
}
],
"containers": 43,
@@ -276,19 +276,19 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost1.storage.enterprise.com"
+ "leaderNode": "localhost8.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost8.storage.enterprise.com"
},
{
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "STAND_ALONE",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost8.storage.enterprise.com"
}
],
"containers": 43,
@@ -315,19 +315,19 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost1.storage.enterprise.com"
+ "leaderNode": "localhost9.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost9.storage.enterprise.com"
},
{
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "STAND_ALONE",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost9.storage.enterprise.com"
}
],
"containers": 43,
@@ -354,19 +354,19 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost1.storage.enterprise.com"
+ "leaderNode": "localhost10.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost10.storage.enterprise.com"
},
{
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "STAND_ALONE",
"replicationFactor": 1,
- "leaderNode": "localhost3.storage.enterprise.com"
+ "leaderNode": "localhost10.storage.enterprise.com"
}
],
"containers": 43,
@@ -413,13 +413,13 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost5.storage.enterprise.com"
+ "leaderNode": "localhost12.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost5.storage.enterprise.com"
+ "leaderNode": "localhost12.storage.enterprise.com"
}
],
"containers": 643,
@@ -446,13 +446,13 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost5.storage.enterprise.com"
+ "leaderNode": "localhost13.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost6.storage.enterprise.com"
+ "leaderNode": "localhost13.storage.enterprise.com"
}
],
"containers": 5,
@@ -479,19 +479,19 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost5.storage.enterprise.com"
+ "leaderNode": "localhost14.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost7.storage.enterprise.com"
+ "leaderNode": "localhost14.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "STAND_ALONE",
"replicationFactor": 1,
- "leaderNode": "localhost7.storage.enterprise.com"
+ "leaderNode": "localhost14.storage.enterprise.com"
}
],
"containers": 64,
@@ -518,13 +518,13 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost5.storage.enterprise.com"
+ "leaderNode": "localhost15.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost8.storage.enterprise.com"
+ "leaderNode": "localhost15.storage.enterprise.com"
}
],
"containers": 21,
@@ -551,13 +551,13 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost11.storage.enterprise.com"
+ "leaderNode": "localhost16.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost9.storage.enterprise.com"
+ "leaderNode": "localhost16.storage.enterprise.com"
}
],
"containers": 897,
@@ -584,19 +584,19 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost11.storage.enterprise.com"
+ "leaderNode": "localhost17.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost10.storage.enterprise.com"
+ "leaderNode": "localhost17.storage.enterprise.com"
},
{
"pipelineID": "01f2e105-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "STAND_ALONE",
"replicationFactor": 1,
- "leaderNode": "localhost10.storage.enterprise.com"
+ "leaderNode": "localhost17.storage.enterprise.com"
}
],
"containers": 6754,
@@ -623,13 +623,13 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost11.storage.enterprise.com"
+ "leaderNode": "localhost18.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost11.storage.enterprise.com"
+ "leaderNode": "localhost18.storage.enterprise.com"
}
],
"containers": 78,
@@ -656,13 +656,13 @@
"pipelineID": "02e3d908-ff01-4ce6-ad75-f3ec79bcc71a",
"replicationType": "RATIS",
"replicationFactor": 3,
- "leaderNode": "localhost11.storage.enterprise.com"
+ "leaderNode": "localhost19.storage.enterprise.com"
},
{
"pipelineID": "05e3d908-ff01-4ce6-ad75-f3ec79bcc7982",
"replicationType": "RATIS",
"replicationFactor": 1,
- "leaderNode": "localhost12.storage.enterprise.com"
+ "leaderNode": "localhost19.storage.enterprise.com"
}
],
"containers": 543,
diff --git
a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/datanodes/datanodes.tsx
b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/datanodes/datanodes.tsx
index 02296ce621..a6eb9a79e9 100644
---
a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/datanodes/datanodes.tsx
+++
b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/datanodes/datanodes.tsx
@@ -126,7 +126,7 @@ const COLUMNS = [
key: 'hostname',
isVisible: true,
isSearchable: true,
- sorter: (a: IDatanode, b: IDatanode) =>
a.hostname.localeCompare(b.hostname),
+ sorter: (a: IDatanode, b: IDatanode) =>
a.hostname.localeCompare(b.hostname, undefined, {numeric: true}),
defaultSortOrder: 'ascend' as const,
fixed: 'left'
},
@@ -137,7 +137,7 @@ const COLUMNS = [
isVisible: true,
isSearchable: true,
filterMultiple: true,
- filters: DatanodeStateList.map(state => ({text: state, value: state})),
+ filters: DatanodeStateList && DatanodeStateList.map(state => ({text:
state, value: state})),
onFilter: (value: DatanodeState, record: IDatanode) => record.state ===
value,
render: (text: DatanodeState) => renderDatanodeState(text),
sorter: (a: IDatanode, b: IDatanode) => a.state.localeCompare(b.state)
@@ -149,7 +149,7 @@ const COLUMNS = [
isVisible: true,
isSearchable: true,
filterMultiple: true,
- filters: DatanodeOpStateList.map(state => ({text: state, value: state})),
+ filters: DatanodeOpStateList && DatanodeOpStateList.map(state => ({text:
state, value: state})),
onFilter: (value: DatanodeOpState, record: IDatanode) => record.opState
=== value,
render: (text: DatanodeOpState) => renderDatanodeOpState(text),
sorter: (a: IDatanode, b: IDatanode) => a.opState.localeCompare(b.opState)
@@ -194,7 +194,7 @@ const COLUMNS = [
return (
<div>
{
- pipelines.map((pipeline, index) => (
+ pipelines && pipelines.map((pipeline, index) => (
<div key={index} className='pipeline-container'>
<ReplicationIcon
replicationFactor={pipeline.replicationFactor}
@@ -343,7 +343,7 @@ export class Datanodes extends
React.Component<Record<string, object>, IDatanode
const datanodesResponse: IDatanodesResponse = response.data;
const totalCount = datanodesResponse.totalCount;
const datanodes: IDatanodeResponse[] = datanodesResponse.datanodes;
- const dataSource: IDatanode[] = datanodes.map(datanode => {
+ const dataSource: IDatanode[] = datanodes && datanodes.map(datanode => {
return {
hostname: datanode.hostname,
uuid: datanode.uuid,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
