Skip to content

Retry sync and rollback #347

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

Merged
merenbach merged 16 commits into from
Jul 3, 2018
Merged

Retry sync and rollback #347

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
307b7c4
Add timeout to sync and rollback commands
Jul 2, 2018
0270fa5
Make defaultCheckTimeoutSeconds package-global
Jul 2, 2018
c147605
Add cancel to context for rollback, sync
Jul 2, 2018
28f4fde
Add cancel after timeout to rollback/sync
Jul 2, 2018
238468c
Assign appName earlier in sync
Jul 2, 2018
0622a11
Don't unnecessarily reassign ctx
Jul 2, 2018
d11b844
Use full func for timeout after all
Jul 2, 2018
22fc3e9
Try applying wait logic
Jul 2, 2018
d5436e5
Add sync/health flags to rollback/sync
Jul 3, 2018
a8c20da
Slight cleanup to realign with spec
Jul 3, 2018
a9e2642
Clean up, still broken
Jul 3, 2018
e67299d
Adapt waitUntilOPerationCompleted, thanks @jessesuen
Jul 3, 2018
e73867c
Log fatal immediately after timeout
Jul 3, 2018
c3853a7
Move fatal log back
Jul 3, 2018
18cf6cc
Reduce diff further
Jul 3, 2018
e2d85d5
Rm two blank lines
Jul 3, 2018
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
39 changes: 20 additions & 19 deletions cmd/argocd/commands/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,6 @@ func NewApplicationWaitCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
healthOnly bool
timeout uint
)
const defaultCheckTimeoutSeconds = 0
var command = &cobra.Command{
Use: "wait APPNAME",
Short: "Wait for an application to reach a synced and healthy state",
Expand Down Expand Up @@ -757,6 +756,7 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
revision string
prune bool
dryRun bool
timeout uint
)
var command = &cobra.Command{
Use: "sync APPNAME",
Expand All @@ -777,7 +777,7 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
}
_, err := appIf.Sync(context.Background(), &syncReq)
errors.CheckError(err)
status, err := waitUntilOperationCompleted(appIf, appName)
status, err := waitUntilOperationCompleted(appIf, appName, timeout)
errors.CheckError(err)
err = printOperationResult(appName, status)
errors.CheckError(err)
Expand All @@ -789,29 +789,27 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
command.Flags().BoolVar(&dryRun, "dry-run", false, "Preview apply without affecting cluster")
command.Flags().BoolVar(&prune, "prune", false, "Allow deleting unexpected resources")
command.Flags().StringVar(&revision, "revision", "", "Sync to a specific revision. Preserves parameter overrides")
command.Flags().UintVar(&timeout, "timeout", defaultCheckTimeoutSeconds, "Time out after this many seconds")
return command
}

func waitUntilOperationCompleted(appClient application.ApplicationServiceClient, appName string) (*argoappv1.OperationState, error) {
wc, err := appClient.Watch(context.Background(), &application.ApplicationQuery{
Name: &appName,
})
if err != nil {
return nil, err
}
appEvent, err := wc.Recv()
if err != nil {
return nil, err
func waitUntilOperationCompleted(appClient application.ApplicationServiceClient, appName string, timeout uint) (*argoappv1.OperationState, error) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

if timeout != 0 {
time.AfterFunc(time.Duration(timeout)*time.Second, func() {
cancel()
})
}
for {

appEventCh := watchApp(ctx, appClient, appName)
for appEvent := range appEventCh {
if appEvent.Application.Status.OperationState != nil && appEvent.Application.Status.OperationState.Phase.Completed() {
return appEvent.Application.Status.OperationState, nil
}
appEvent, err = wc.Recv()
if err != nil {
return nil, err
}
}
return nil, fmt.Errorf("Timed out (%ds) waiting for app %q match desired state", timeout, appName)
}

// setParameterOverrides updates an existing or appends a new parameter override in the application
Expand Down Expand Up @@ -892,7 +890,8 @@ func paramString(params []argoappv1.ComponentParameter) string {
// NewApplicationRollbackCommand returns a new instance of an `argocd app rollback` command
func NewApplicationRollbackCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
var (
prune bool
prune bool
timeout uint
)
var command = &cobra.Command{
Use: "rollback APPNAME",
Expand Down Expand Up @@ -928,7 +927,7 @@ func NewApplicationRollbackCommand(clientOpts *argocdclient.ClientOptions) *cobr
})
errors.CheckError(err)

status, err := waitUntilOperationCompleted(appIf, appName)
status, err := waitUntilOperationCompleted(appIf, appName, timeout)
errors.CheckError(err)
err = printOperationResult(appName, status)
errors.CheckError(err)
Expand All @@ -938,10 +937,12 @@ func NewApplicationRollbackCommand(clientOpts *argocdclient.ClientOptions) *cobr
},
}
command.Flags().BoolVar(&prune, "prune", false, "Allow deleting unexpected resources")
command.Flags().UintVar(&timeout, "timeout", defaultCheckTimeoutSeconds, "Time out after this many seconds")
return command
}

const printOpFmtStr = "%-20s%s\n"
const defaultCheckTimeoutSeconds = 0

func printOperationResult(appName string, opState *argoappv1.OperationState) error {
fmt.Printf(printOpFmtStr, "Application:", appName)
Expand Down