Skip to content

Commit a220aef

Browse files
committed
fix pipeline stuck in queue status because etcd server abnormal
1 parent c315ced commit a220aef

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

internal/tools/pipeline/providers/dbgc/definition_cleanup/provider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (p *provider) handleLogDir() error {
6969
return err
7070
}
7171
// dir is not exist
72-
return os.Mkdir(p.Cfg.LogDir, 0755)
72+
return os.MkdirAll(p.Cfg.LogDir, 0755)
7373
}
7474

7575
func (p *provider) Init(ctx servicehub.Context) error {

internal/tools/pipeline/providers/leaderworker/impl_worker.go

+6
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ package leaderworker
1616

1717
import (
1818
"context"
19+
"fmt"
1920
"time"
2021

22+
"github.com/pkg/errors"
2123
clientv3 "go.etcd.io/etcd/client/v3"
2224

2325
"github.com/erda-project/erda/internal/tools/pipeline/providers/leaderworker/lwctx"
@@ -151,6 +153,10 @@ func (p *provider) workerIntervalCleanupOnDelete(ctx context.Context, ev Event)
151153
if err == nil {
152154
return
153155
}
156+
// actively panic exit
157+
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
158+
panic(fmt.Errorf("actively panic exit, maybe the etcd server has been shut down, err: %v", err))
159+
}
154160
p.Log.Errorf("failed to do worker interval cleanup on delete(auto retry), step: delete heartbeat key, workerID: %s, err: %v", ev.WorkerID, err)
155161
time.Sleep(p.Cfg.Worker.RetryInterval)
156162
}

0 commit comments

Comments
 (0)