Skip to content

feat: integrate new agentexec pkg #15609

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
merged 6 commits into from
Nov 27, 2024
Merged

feat: integrate new agentexec pkg #15609

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b68a46a
feat: integrate agentexec pkg
sreya Nov 20, 2024
5746401
make adjusting resource scores non-fatal
sreya Nov 25, 2024
744693f
sanity check lint rules
sreya Nov 25, 2024
0ed1279
Revert "sanity check lint rules"
sreya Nov 25, 2024
0436cc2
integrate into cli
sreya Nov 27, 2024
8a6dfae
import
sreya Nov 27, 2024
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
Prev Previous commit
Next Next commit
make adjusting resource scores non-fatal
  • Loading branch information
@sreya
sreya committed Nov 25, 2024
commit 5746401dde96780cd7b98d454608cb47568c4d01
17 changes: 14 additions & 3 deletions agent/agentexec/cli_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const unset = -2000
// CLI runs the agent-exec command. It should only be called by the cli package.
func CLI() error {
// We lock the OS thread here to avoid a race condition where the nice priority
// we get is on a different thread from the one we set it on.
// we set gets applied to a different thread than the one we exec the provided
// command on.
runtime.LockOSThread()
// Nop on success but we do it anyway in case of an error.
defer runtime.UnlockOSThread()
Expand Down Expand Up @@ -68,12 +69,18 @@ func CLI() error {

err = unix.Setpriority(unix.PRIO_PROCESS, 0, *nice)
if err != nil {
return xerrors.Errorf("set nice score: %w", err)
// We alert the user instead of failing the command since it can be difficult to debug
// for a template admin otherwise. It's quite possible (and easy) to set an
// inappriopriate value for niceness.
printfStdErr("failed to adjust niceness to %q: %v", *nice, err)
}

err = writeOOMScoreAdj(*oom)
if err != nil {
return xerrors.Errorf("set oom score: %w", err)
// We alert the user instead of failing the command since it can be difficult to debug
// for a template admin otherwise. It's quite possible (and easy) to set an
// inappriopriate value for oom_score_adj.
printfStdErr("failed to adjust oom score to %q: %v", *nice, err)
}

path, err := exec.LookPath(args[0])
Expand Down Expand Up @@ -143,3 +150,7 @@ func execArgs(args []string) []string {
}
return nil
}

func printfStdErr(format string, a ...any) {
_, _ = fmt.Fprintf(os.Stderr, "coder-agent: %s\n", fmt.Sprintf(format, a...))
}
Loading