Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-05-24 09:50:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Issue #147 - App sync frequently fails due to concurrent app modification (#226)

Browse source
This commit is contained in:
Alexander Matyushentsev 2018-05-22 09:43:17 -07:00 committed by GitHub
parent d0479e6ddc
commit 13b090e3bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
server/application/application.go
View file

@ -456,19 +456,25 @@ func (s *Server) Rollback(ctx context.Context, rollbackReq *ApplicationRollbackR
}
func (s *Server) setAppOperation(ctx context.Context, appName string, operationCreator func(app *appv1.Application) (*appv1.Operation, error)) (*appv1.Application, error) {
app, err := s.Get(ctx, &ApplicationQuery{Name: &appName})
if err != nil {
return nil, err
for {
a, err := s.Get(ctx, &ApplicationQuery{Name: &appName})
if err != nil {
return nil, err
}
if a.Operation != nil {
return nil, status.Errorf(codes.InvalidArgument, "another operation is already in progress")
}
op, err := operationCreator(a)
if err != nil {
return nil, err
}
a.Operation = op
a.Status.OperationState = nil
_, err = s.Update(ctx, a)
if err != nil && apierr.IsConflict(err) {
log.Warnf("Failed to set operation for app '%s' due to update conflict. Retrying again...", appName)
} else {
return a, err
}
}
if app.Operation != nil {
return nil, status.Errorf(codes.InvalidArgument, "another operation is already in progress")
}
op, err := operationCreator(app)
if err != nil {
return nil, err
}
app.Operation = op
app.Status.OperationState = nil
_, err = s.Update(ctx, app)
return app, err
}