From 90846202dbe666758933d4aa8f93a710da27634d Mon Sep 17 00:00:00 2001 From: smitajoshi Date: Mon, 10 Apr 2023 22:45:51 +0530 Subject: [PATCH 1/4] HDDS-8340. Recon Show the number of containers that have been DELETED in UI. --- .../webapps/recon/ozone-recon-web/api/db.json | 1 + .../ozone-recon-web/src/views/overview/overview.tsx | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 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 4749a0d6a018..c146430025bd 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 @@ -11,6 +11,7 @@ "containers": 3230, "missingContainers": 1002, "openContainers": 5, + "deletedContainers": 4, "volumes": 5, "buckets": 156, "keys": 253000 diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx index cc007ae79cc8..2ab73079ae7d 100644 --- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx +++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx @@ -41,6 +41,7 @@ interface IClusterStateResponse { buckets: number; keys: number; openContainers: number; + deletedContainers: number; } interface IOverviewState { @@ -58,6 +59,7 @@ interface IOverviewState { lastUpdatedOMDBFull: number; omStatus: string; openContainers: number; + deletedContainers: number; } export class Overview extends React.Component, IOverviewState> { @@ -84,7 +86,8 @@ export class Overview extends React.Component, IOverviewS lastUpdatedOMDBDelta: 0, lastUpdatedOMDBFull: 0, omStatus: '', - openContainers: 0 + openContainers: 0, + deletedContainers: 0 }; this.autoReload = new AutoReloadHelper(this._loadData); } @@ -115,6 +118,7 @@ export class Overview extends React.Component, IOverviewS keys: clusterState.keys, missingContainersCount, openContainers: clusterState.openContainers, + deletedContainers: clusterState.deletedContainers, lastRefreshed: Number(moment()), lastUpdatedOMDBDelta: omDBDeltaObject && omDBDeltaObject.lastUpdatedTimestamp, lastUpdatedOMDBFull: omDBFullObject && omDBFullObject.lastUpdatedTimestamp @@ -158,7 +162,7 @@ export class Overview extends React.Component, IOverviewS render() { const {loading, datanodes, pipelines, storageReport, containers, volumes, buckets, - keys, missingContainersCount, lastRefreshed, lastUpdatedOMDBDelta, lastUpdatedOMDBFull, omStatus, openContainers } = this.state; + keys, missingContainersCount, lastRefreshed, lastUpdatedOMDBDelta, lastUpdatedOMDBFull, omStatus, openContainers, deletedContainers } = this.state; const datanodesElement = ( @@ -227,6 +231,9 @@ export class Overview extends React.Component, IOverviewS + + + ); From 1da1a5432f631ffd64c08da9761205f7ea18c750 Mon Sep 17 00:00:00 2001 From: smitajoshi Date: Fri, 14 Apr 2023 09:22:27 +0530 Subject: [PATCH 2/4] Recon Show the number of containers that have been DELETED in UI toString function() --- .../recon/ozone-recon-web/src/views/overview/overview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx index 2ab73079ae7d..8e26436ef7d5 100644 --- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx +++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx @@ -232,7 +232,7 @@ export class Overview extends React.Component, IOverviewS - + From 38d3aed554949a162647637eaadd8c42d7211ace Mon Sep 17 00:00:00 2001 From: smitajoshi Date: Mon, 17 Apr 2023 15:48:14 +0530 Subject: [PATCH 3/4] HDDS-8340. Recon Show the number of containers that have been DELETED in UI check undefined --- .../recon/ozone-recon-web/src/views/overview/overview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx index 8e26436ef7d5..8ac8adf64cff 100644 --- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx +++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx @@ -232,7 +232,7 @@ export class Overview extends React.Component, IOverviewS - + From e8662f3b439f2fb2d20afda6ee828d90f1800360 Mon Sep 17 00:00:00 2001 From: smitajoshi Date: Thu, 27 Apr 2023 12:06:23 +0530 Subject: [PATCH 4/4] HDDS-8340. Recon Show the number of containers that have been DELETED in UI revert changes for undefined condition --- .../recon/ozone-recon-web/src/views/overview/overview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx index 8ac8adf64cff..2ab73079ae7d 100644 --- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx +++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/overview/overview.tsx @@ -232,7 +232,7 @@ export class Overview extends React.Component, IOverviewS - +