From c9d6ba146971dae15f9b4bb9a8902d5441a584bd Mon Sep 17 00:00:00 2001 From: "stonezdj(Daojun Zhang)" Date: Mon, 4 Jul 2022 18:10:59 +0800 Subject: [PATCH] Revert "Skip to refresh execution status when unchanged (#17023)" (#17111) This reverts commit 88b8a7ac2cfe6ce5b54de0de8097af6ebfb102f4. Signed-off-by: stonezdj --- src/pkg/task/dao/execution.go | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/pkg/task/dao/execution.go b/src/pkg/task/dao/execution.go index 6ece9da1b..b1c6dd768 100644 --- a/src/pkg/task/dao/execution.go +++ b/src/pkg/task/dao/execution.go @@ -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