Skip to content
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

fix: G: remove variable for unused context parameter #3333

Merged
merged 11 commits into from
Jan 18, 2025
Merged

fix: G: remove variable for unused context parameter #3333

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
566daa4
safe concurrent process data
aaron-kasten Jan 17, 2025
6c4b09b
use RW lock, keep process data consistent with wait
aaron-kasten Jan 17, 2025
74b0d78
use RWMutex
aaron-kasten Jan 17, 2025
9419a9b
fixup lock for logging deadlock
aaron-kasten Jan 17, 2025
5907699
int overflow safe
aaron-kasten Jan 17, 2025
62a400b
comment. fixup lock
aaron-kasten Jan 17, 2025
251598a
concurrent safe process data
aaron-kasten Jan 17, 2025
941a7ee
comment.
aaron-kasten Jan 17, 2025
fd90e1d
Merge branch 'master' of github.com:kanisterio/kanister into kanx-2-k…
aaron-kasten Jan 17, 2025
f574197
Merge branch 'kanx-2-kubexec-F3' of github.com:aaron-kasten/kanister …
aaron-kasten Jan 17, 2025
7da249b
Merge branch 'master' into kanx-2-kubexec-G
mergify[bot] Jan 18, 2025
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
7 changes: 3 additions & 4 deletions pkg/kanx/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ func (s *processServiceServer) CreateProcess(_ context.Context, cpr *CreateProce
if err != nil {
return nil, err
}

s.storeProcess(int64(cmd.Process.Pid), p)
fields := field.M{"pid": cmd.Process.Pid, "stdout": stdoutfd.Name(), "stderr": stderrfd.Name()}
stdoutLogWriter.SetFields(fields)
Expand Down Expand Up @@ -139,15 +138,15 @@ func (s *processServiceServer) storeProcess(pid int64, p *process) {
s.processes.Store(pid, p)
}

func (s *processServiceServer) GetProcess(ctx context.Context, grp *ProcessPidRequest) (*Process, error) {
func (s *processServiceServer) GetProcess(_ context.Context, grp *ProcessPidRequest) (*Process, error) {
p, ok := s.loadProcess(grp.GetPid())
if !ok {
return nil, errkit.WithStack(errProcessNotFound)
}
return processToProtoWithLock(p), nil
}

func (s *processServiceServer) SignalProcess(ctx context.Context, grp *SignalProcessRequest) (*Process, error) {
func (s *processServiceServer) SignalProcess(_ context.Context, grp *SignalProcessRequest) (*Process, error) {
p, ok := s.loadProcess(grp.GetPid())
if !ok {
return nil, errkit.WithStack(errProcessNotFound)
Expand All @@ -164,7 +163,7 @@ func (s *processServiceServer) SignalProcess(ctx context.Context, grp *SignalPro
return processToProto(p), err
}

func (s *processServiceServer) ListProcesses(lpr *ListProcessesRequest, lps ProcessService_ListProcessesServer) error {
func (s *processServiceServer) ListProcesses(_ *ListProcessesRequest, lps ProcessService_ListProcessesServer) error {
var err error
s.processes.Range(func(key, value any) bool {
err = lps.Send(processToProtoWithLock(value.(*process)))
Expand Down
Loading