Skip to content

fix: fix borked concurrency bits #19

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
hellt merged 2 commits into from
Dec 14, 2022
Merged

fix: fix borked concurrency bits #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10ed65d
fix: fix borked concurrency bits
carlmontanari Dec 13, 2022
61c39b8
rename var
hellt Dec 13, 2022
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
70 changes: 53 additions & 17 deletions commando/cmdo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ type appCfg struct {
commands string // commands to send
}

type respTuple struct {
name string
resp []interface{}
}

// run runs the commando.
func (app *appCfg) run() error {
i := &inventory{}
Expand All @@ -125,7 +130,10 @@ func (app *appCfg) run() error {
}

rw := app.newResponseWriter(app.output)
rCh := make(chan []interface{})

respCh := make(chan respTuple)

doneCh := make(chan interface{})

if app.output == fileOutput {
log.SetOutput(os.Stderr)
Expand All @@ -136,14 +144,15 @@ func (app *appCfg) run() error {
wg.Add(len(i.Devices))

for n, d := range i.Devices {
go app.runOperations(n, d, rCh)

resps := <-rCh
go app.outputResult(wg, rw, n, resps)
go app.runOperations(n, d, respCh)
}

go app.outputResult(wg, rw, respCh, doneCh)

wg.Wait()

doneCh <- nil

if app.output == fileOutput {
log.Infof("outputs have been saved to '%s' directory", app.outDir)
}
Expand Down Expand Up @@ -321,10 +330,13 @@ func runCommands(name string, d *device, driver *network.Driver) ([]interface{},
func (app *appCfg) runOperations(
name string,
d *device,
rCh chan<- []interface{}) {
rCh chan<- respTuple) {
driver, err := app.openCoreConn(name, d)
if err != nil {
rCh <- nil
rCh <- respTuple{
name: name,
resp: nil,
}

return
}
Expand All @@ -333,7 +345,10 @@ func (app *appCfg) runOperations(

cfgResponses, err := runCfg(name, d, driver)
if err != nil {
rCh <- nil
rCh <- respTuple{
name: name,
resp: nil,
}

return
}
Expand All @@ -342,31 +357,52 @@ func (app *appCfg) runOperations(

err = runConfigs(name, d, driver)
if err != nil {
rCh <- nil
rCh <- respTuple{
name: name,
resp: nil,
}

return
}

cmdResponses, err := runCommands(name, d, driver)
if err != nil {
rCh <- nil
rCh <- respTuple{
name: name,
resp: nil,
}

return
}

responses = append(responses, cmdResponses...)

rCh <- responses
rCh <- respTuple{
name: name,
resp: responses,
}
}

func (app *appCfg) outputResult(
wg *sync.WaitGroup,
rw responseWriter,
name string,
r []interface{}) {
defer wg.Done()

if err := rw.WriteResponse(r, name); err != nil {
log.Errorf("error while writing the response: %v", err)
rCh chan respTuple,
doneCh chan interface{},
) {
for {
select {
case <-doneCh:
return
case r := <-rCh:
if err := rw.WriteResponse(r.resp, r.name); err != nil {
log.Errorf("error while writing the response: %v", err)

// don't defer the wg.Done because it needs to always be decremented at each
// iteration!
wg.Done()
} else {
wg.Done()
}
}
}
}
4 changes: 0 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/scrapli/scrapligo v1.0.0/go.mod h1:jvRMdb90MNnswMiku8UNXj8JZaOIPhwhcqqFwr9qeoY=
github.com/scrapli/scrapligo v1.0.2 h1:IzZPtfuuINvewd72Jjt91fr43s3y1shI4rXWnKmpC7A=
github.com/scrapli/scrapligo v1.0.2/go.mod h1:jvRMdb90MNnswMiku8UNXj8JZaOIPhwhcqqFwr9qeoY=
github.com/scrapli/scrapligo v1.0.3 h1:nLqW1FquCG//l8lzPS9rGIMX/9fe8v9dJoupnem3Hdc=
github.com/scrapli/scrapligo v1.0.3/go.mod h1:jvRMdb90MNnswMiku8UNXj8JZaOIPhwhcqqFwr9qeoY=
github.com/scrapli/scrapligo v1.1.0 h1:KjCam57kIV2rlxAQg/J1G7v/xgRHvpJF+Gjz+LXhQaI=
github.com/scrapli/scrapligo v1.1.0/go.mod h1:jvRMdb90MNnswMiku8UNXj8JZaOIPhwhcqqFwr9qeoY=
github.com/scrapli/scrapligocfg v1.0.0 h1:540SuGqqM6rKN87SLCfR54IageQ6s3a/ZOycGRgbbak=
Expand Down