Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Skip to refresh execution status when unchanged(#17034)" (#17112) 

Revert "(cherry-pick) Skip to refresh execution status when unchanged (#17034)"

This reverts commit b6e4ef5b54.

Signed-off-by: stonezdj <stonezdj@gmail.com>
This commit is contained in:
stonezdj(Daojun Zhang) 2022-07-04 18:10:46 +08:00 committed by GitHub
parent 6688271792
commit 5647210797
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pkg/task/dao/execution.go
View File

@ -1,16 +1,16 @@
// Copyright Project Harbor Authors
// Copyright Project Harbor Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package dao
@ -205,6 +205,10 @@ func (e *executionDAO) RefreshStatus(ctx context.Context, id int64) (bool, strin
// 3. bool: whether a retry is needed
// 4. error: the error
func (e *executionDAO) refreshStatus(ctx context.Context, id int64) (bool, string, bool, error) {
execution, err := e.Get(ctx, id)
if err != nil {
return false, "", false, err
}
metrics, err := e.GetMetrics(ctx, id)
if err != nil {
return false, "", false, err
@ -225,14 +229,6 @@ func (e *executionDAO) refreshStatus(ctx context.Context, id int64) (bool, strin
status = job.SuccessStatus.String()
}
execution, err := e.Get(ctx, id)
if err != nil {
return false, "", false, err
}
if status == execution.Status {
return false, status, false, nil // status not changed
}
ormer, err := orm.FromContext(ctx)
if err != nil {
return false, "", false, err