Skip to content

feat(mc2mc): termination on exhausted retry #92

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

feat(mc2mc): termination on exhausted retry #92

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
14 changes: 12 additions & 2 deletions mc2mc/internal/client/odps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (c *odpsClient) ExecSQL(ctx context.Context, query string, additionalHints
// generate log view
url, err := c.generateLogView(taskIns)
if err != nil {
err = e.Join(err, taskIns.Terminate())
err = e.Join(err, c.terminate(taskIns))
return errors.WithStack(err)
}
c.logger.Info(fmt.Sprintf("taskId: %s, log view: %s , hints: (%s)", taskIns.Id(), url, getHintsString(hints)))
Expand All @@ -64,7 +64,12 @@ func (c *odpsClient) ExecSQL(ctx context.Context, query string, additionalHints
c.logger.Info(msg)
return errors.WithStack(c.terminate(taskIns))
case err := <-c.wait(taskIns):
return errors.WithStack(err)
if err != nil {
c.logger.Error(fmt.Sprintf("task instance %s failed: %s", taskIns.Id(), err))
err = e.Join(err, c.terminate(taskIns)) // terminate task instance on failure
return errors.WithStack(err)
}
return nil
}
}

Expand Down Expand Up @@ -146,6 +151,11 @@ func (c *odpsClient) wait(taskIns *odps.Instance) <-chan error {
if err != nil {
err := errors.Wrap(err, fmt.Sprintf("task instance %s failed", taskIns.Id()))
errChan <- errors.WithStack(err)
return
}
if err := taskIns.Load(); err != nil {
c.logger.Warn(fmt.Sprintf("failed to load task instance %s: %s", taskIns.Id(), err))
return
}
c.logger.Info(fmt.Sprintf("task instance %s finished with status: %s", taskIns.Id(), taskIns.Status()))
sum, err := taskIns.GetTaskSummary(taskIns.TaskNameCommitted())
Expand Down
Loading