From 6f01d7480b9fb45a3c88696fcc7cb2fe333e89aa Mon Sep 17 00:00:00 2001
From: Shijun Sun <30999793+AllForNothing@users.noreply.github.com>
Date: Fri, 3 Mar 2023 14:44:36 +0800
Subject: [PATCH] Add retry times for calling CVE data export execution list
API (#18297)
1.Fixes #17879
2.Add retry times to avoid endless API calls for CVE data export execution list API
Signed-off-by: AllForNothing <sshijun@vmware.com>
---
.../operation/operation.component.ts | 25 +++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/portal/src/app/shared/components/operation/operation.component.ts b/src/portal/src/app/shared/components/operation/operation.component.ts
index bd195eb62c0..04a58b88bc8 100644
--- a/src/portal/src/app/shared/components/operation/operation.component.ts
+++ b/src/portal/src/app/shared/components/operation/operation.component.ts
@@ -27,6 +27,7 @@ const MAX_NUMBER: number = 500;
const MAX_SAVING_TIME: number = 1000 * 60 * 60 * 24 * 30; // 30 days
const TIMEOUT = 7000;
const FILE_NAME_PREFIX: string = 'csv_file_';
+const RETRY_TIMES: number = 50;
@Component({
selector: 'hbr-operation-model',
templateUrl: './operation.component.html',
@@ -34,7 +35,6 @@ const FILE_NAME_PREFIX: string = 'csv_file_';
animations: [SlideInOutAnimation],
})
export class OperationComponent implements OnInit, OnDestroy {
- fileNamePrefix: string = FILE_NAME_PREFIX;
batchInfoSubscription: Subscription;
resultLists: OperateInfo[] = [];
exportJobs: OperateInfo[] = [];
@@ -59,6 +59,7 @@ export class OperationComponent implements OnInit, OnDestroy {
}
timeout;
refreshExportJobSub: Subscription;
+ retryTimes: number = RETRY_TIMES;
constructor(
private session: SessionService,
private operationService: OperationService,
@@ -74,7 +75,7 @@ export class OperationComponent implements OnInit, OnDestroy {
if (this.animationState === 'out') {
this._newMessageCount += 1;
}
- this.refreshExportJobs();
+ this.refreshExportJobs(false);
}
);
}
@@ -148,7 +149,7 @@ export class OperationComponent implements OnInit, OnDestroy {
init() {
if (this.session.getCurrentUser()) {
- this.refreshExportJobs();
+ this.refreshExportJobs(false);
const operationInfosString: string = localStorage.getItem(
`${OPERATION_KEY}-${this.session.getCurrentUser().user_id}`
);
@@ -248,6 +249,7 @@ export class OperationComponent implements OnInit, OnDestroy {
daysAgo
);
});
+ this.refreshExportJobs(false);
}
calculateTime(
@@ -268,8 +270,13 @@ export class OperationComponent implements OnInit, OnDestroy {
return s;
}
}
- refreshExportJobs() {
+ refreshExportJobs(isRetry: boolean) {
if (this.session.getCurrentUser()) {
+ if (isRetry) {
+ this.retryTimes--;
+ } else {
+ this.retryTimes = RETRY_TIMES;
+ }
this.scanDataExportService
.getScanDataExportExecutionList()
.subscribe(res => {
@@ -300,9 +307,13 @@ export class OperationComponent implements OnInit, OnDestroy {
}
});
this.refreshTimestampForExportJob();
- if (flag) {
+ if (flag && this.retryTimes > 0) {
+ if (this.timeout) {
+ clearTimeout(this.timeout);
+ this.timeout = null;
+ }
this.timeout = setTimeout(() => {
- this.refreshExportJobs();
+ this.refreshExportJobs(true);
}, TIMEOUT);
}
}
@@ -346,7 +357,7 @@ export class OperationComponent implements OnInit, OnDestroy {
.subscribe(
res => {
downloadCVEs(res, info.data.name);
- this.refreshExportJobs();
+ this.refreshExportJobs(false);
},
error => {
this.msgHandler.error(error);