Skip to content

fix: Avoid sync retry if file/directory was not found #9721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Avoid sync retry if file/directory was not found #9721

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 35 additions & 20 deletions pkg/skaffold/runner/dev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ import (
"fmt"
"io"
"strconv"
"strings"
"time"

"github.com/cenkalti/backoff/v4"
"go.opentelemetry.io/otel/trace"

"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/constants"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/event"
Expand Down Expand Up @@ -93,29 +95,16 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer) error {
instrumentation.AddDevIteration("sync")
meterUpdated = true

syncHandler := func(s *sync.Item) error {
fileCount := len(s.Copy) + len(s.Delete)
output.Default.Fprintf(out, "Syncing %d files for %s\n", fileCount, s.Image)
fileSyncInProgress(fileCount, s.Image)

if err := r.deployer.GetSyncer().Sync(childCtx, out, s); err != nil {
log.Entry(ctx).Warn("Skipping deploy due to sync error:", err)
fileSyncFailed(fileCount, s.Image, err)
event.DevLoopFailedInPhase(r.devIteration, constants.Sync, err)
eventV2.TaskFailed(constants.DevLoop, err)
endTrace(instrumentation.TraceEndError(err))

return err
}

fileSyncSucceeded(fileCount, s.Image)

return nil
}
syncHandler := r.getSyncHandler(ctx, childCtx, out, endTrace)
for _, s := range r.changeSet.NeedsResync() {
err := backoff.Retry(
func() error {
return syncHandler(s)
err := syncHandler(s)
if err == nil || strings.Contains(err.Error(), "no such file or directory") {
return nil
}

return err
}, backoff.WithContext(opts, childCtx),
)

Expand Down Expand Up @@ -232,6 +221,32 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer) error {
return nil
}

func (r *SkaffoldRunner) getSyncHandler(
ctx, childCtx context.Context,
out io.Writer,
endTrace func(options ...trace.SpanEndOption),
) func(s *sync.Item) error {
return func(s *sync.Item) error {
fileCount := len(s.Copy) + len(s.Delete)
output.Default.Fprintf(out, "Syncing %d files for %s\n", fileCount, s.Image)
fileSyncInProgress(fileCount, s.Image)

if err := r.deployer.GetSyncer().Sync(childCtx, out, s); err != nil {
log.Entry(ctx).Warn("Skipping deploy due to sync error:", err)
fileSyncFailed(fileCount, s.Image, err)
event.DevLoopFailedInPhase(r.devIteration, constants.Sync, err)
eventV2.TaskFailed(constants.DevLoop, err)
endTrace(instrumentation.TraceEndError(err))

return err
}

fileSyncSucceeded(fileCount, s.Image)

return nil
}
}

// Dev watches for changes and runs the skaffold build, test and deploy
// config until interrupted by the user.
func (r *SkaffoldRunner) Dev(ctx context.Context, out io.Writer, artifacts []*latest.Artifact) error {
Expand Down