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

Jump to bottom

Add -race Flag to GitHub Action and Fix Data Race in CreateTailscaleNodesInUser #2038

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+9 −5
Open

Add -race Flag to GitHub Action and Fix Data Race in CreateTailscaleNodesInUser #2038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd39688
Add -race flag to Makefile and integration tests; fix data race in Cr…
nadongjun Jul 30, 2024
126177c
Fix data race in ExecuteCommand by using local buffers and mutex
nadongjun Aug 20, 2024
0c1309b
Merge branch 'main' into add-race-option
nadongjun Oct 2, 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
2 changes: 1 addition & 1 deletion .github/workflows/test-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
--volume $PWD/control_logs:/tmp/control \
--env HEADSCALE_INTEGRATION_POSTGRES=${{env.USE_POSTGRES}} \
golang:1 \
go run gotest.tools/gotestsum@latest -- ./... \
go run gotest.tools/gotestsum@latest -- -race ./... \
-failfast \
-timeout 120m \
-parallel 1 \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ build:
dev: lint test build

test:
gotestsum -- -short -coverprofile=coverage.out ./...
gotestsum -- -short -race -coverprofile=coverage.out ./...

test_integration:
docker run \
Expand All @@ -33,7 +33,7 @@ test_integration:
-v /var/run/docker.sock:/var/run/docker.sock \
-v $$PWD/control_logs:/tmp/control \
golang:1 \
go run gotest.tools/gotestsum@latest -- -failfast ./... -timeout 120m -parallel 8
go run gotest.tools/gotestsum@latest -- -race -failfast ./... -timeout 120m -parallel 8

lint:
golangci-lint run --fix --timeout 10m
Expand Down
4 changes: 2 additions & 2 deletions integration/dockertestutil/execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"errors"
"fmt"
"sync"
"time"

"github.com/ory/dockertest/v3"
Expand All @@ -25,7 +26,6 @@ type ExecuteCommandOption func(*ExecuteCommandConfig) error
func ExecuteCommandTimeout(timeout time.Duration) ExecuteCommandOption {
return ExecuteCommandOption(func(conf *ExecuteCommandConfig) error {
conf.timeout = timeout

return nil
})
}
Expand Down Expand Up @@ -67,6 +67,7 @@ func ExecuteCommand(
StdErr: &stderr,
},
)

resultChan <- result{exitCode, err}
}()

Expand All @@ -88,7 +89,6 @@ func ExecuteCommand(

return stdout.String(), stderr.String(), nil
case <-time.After(execConfig.timeout):

return stdout.String(), stderr.String(), ErrDockertestCommandTimeout
}
}
4 changes: 4 additions & 0 deletions integration/scenario.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,18 +351,22 @@ func (s *Scenario) CreateTailscaleNodesInUser(
cert := headscale.GetCert()
hostname := headscale.GetHostname()

s.mu.Lock()
opts = append(opts,
tsic.WithHeadscaleTLS(cert),
tsic.WithHeadscaleName(hostname),
)
s.mu.Unlock()

user.createWaitGroup.Go(func() error {
s.mu.Lock()
tsClient, err := tsic.New(
s.pool,
version,
s.network,
opts...,
)
s.mu.Unlock()
if err != nil {
return fmt.Errorf(
"failed to create tailscale (%s) node: %w",
Expand Down
Loading