Skip to content

Fix context usage in executor #3223

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: master
Choose a base branch
from
Open

Fix context usage in executor #3223

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions runner/internal/executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ func (ex *RunExecutor) execJob(ctx context.Context, jobLogFile io.Writer) error
}

// Call buildLDLibraryPathEnv and update jobEnvs if no error occurs
newLDPath, err := buildLDLibraryPathEnv()
newLDPath, err := buildLDLibraryPathEnv(ctx)
if err != nil {
log.Info(ctx, "Continuing without updating LD_LIBRARY_PATH")
} else {
Expand Down Expand Up @@ -611,9 +611,9 @@ func isPtyError(err error) bool {
return errors.As(err, &e) && errors.Is(e.Err, syscall.EIO)
}

func buildLDLibraryPathEnv() (string, error) {
func buildLDLibraryPathEnv(ctx context.Context) (string, error) {
// Execute shell command to get Python prefix
cmd := exec.Command("bash", "-i", "-c", "python3-config --prefix")
cmd := exec.CommandContext(ctx, "bash", "-i", "-c", "python3-config --prefix")
output, err := cmd.Output()
if err != nil {
return "", fmt.Errorf("error executing command: %w", err)
Expand Down
16 changes: 8 additions & 8 deletions runner/internal/executor/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ func (ex *RunExecutor) setupRepo(ctx context.Context) error {
return gerrors.Wrap(err)
}
defer func() { _ = os.RemoveAll(tmpRepoDir) }()
err = ex.moveRepoDir(tmpRepoDir)
err = ex.moveRepoDir(ctx, tmpRepoDir)
if err != nil {
return gerrors.Wrap(err)
}
defer func() {
err_ := ex.restoreRepoDir(tmpRepoDir)
err_ := ex.restoreRepoDir(ctx, tmpRepoDir)
if err == nil {
err = gerrors.Wrap(err_)
}
Expand Down Expand Up @@ -171,23 +171,23 @@ func (ex *RunExecutor) shouldCheckout(ctx context.Context) (bool, error) {
return false, nil
}

func (ex *RunExecutor) moveRepoDir(tmpDir string) error {
if err := moveDir(ex.repoDir, tmpDir); err != nil {
func (ex *RunExecutor) moveRepoDir(ctx context.Context, tmpDir string) error {
if err := moveDir(ctx, ex.repoDir, tmpDir); err != nil {
return gerrors.Wrap(err)
}
return nil
}

func (ex *RunExecutor) restoreRepoDir(tmpDir string) error {
if err := moveDir(tmpDir, ex.repoDir); err != nil {
func (ex *RunExecutor) restoreRepoDir(ctx context.Context, tmpDir string) error {
if err := moveDir(ctx, tmpDir, ex.repoDir); err != nil {
return gerrors.Wrap(err)
}
return nil
}

func moveDir(srcDir, dstDir string) error {
func moveDir(ctx context.Context, srcDir, dstDir string) error {
// We cannot just move/rename files because with volumes they'll be on different devices
cmd := exec.Command("cp", "-a", srcDir+"/.", dstDir)
cmd := exec.CommandContext(ctx, "cp", "-a", srcDir+"/.", dstDir)
if output, err := cmd.CombinedOutput(); err != nil {
return fmt.Errorf("failed to cp: %w, output: %s", err, string(output))
}
Expand Down