|
|
@ -52,15 +52,12 @@ func (e *EtcdLocker) ExecuteWithLock(ctx context.Context, taskName string, task
|
|
|
|
|
|
|
|
|
|
|
|
err = mutex.TryLock(ctxWithTimeout)
|
|
|
|
err = mutex.TryLock(ctxWithTimeout)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
if err == context.DeadlineExceeded {
|
|
|
|
// errors.Is(err, concurrency.ErrLocked)
|
|
|
|
log.ZDebug(ctx, "Task is being executed by another instance, skipping",
|
|
|
|
log.ZDebug(ctx, "Task is being executed by another instance, skipping",
|
|
|
|
"taskName", taskName,
|
|
|
|
"taskName", taskName,
|
|
|
|
"instanceID", e.instanceID)
|
|
|
|
"instanceID", e.instanceID,
|
|
|
|
} else {
|
|
|
|
"error", err.Error())
|
|
|
|
log.ZWarn(ctx, "Failed to acquire task lock", err,
|
|
|
|
|
|
|
|
"taskName", taskName,
|
|
|
|
|
|
|
|
"instanceID", e.instanceID)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|