Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Fix race condition in updates test (#4661)

Browse Source 
Copy the DefaultOptions in order to prevent a data race on the Targets
map. This race should only have effected testing.

Race detector output:

```
WARNING: DATA RACE
Read at 0x00c0000908d0 by goroutine 15:
  runtime.mapaccess1_faststr()
      /opt/hostedtoolcache/go/1.18.0/x64/src/runtime/map_faststr.go:13 +0x0
  github.com/fleetdm/fleet/v4/orbit/pkg/update.TestMakeRepoPath.func1()
      /home/runner/work/fleet/fleet/orbit/pkg/update/update_test.go:58 +0xb6
  testing.tRunner()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1439 +0x213
  testing.(*T).Run.func1()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1486 +0x47

Previous write at 0x00c0000908d0 by goroutine 12:
  runtime.mapassign_faststr()
      /opt/hostedtoolcache/go/1.18.0/x64/src/runtime/map_faststr.go:203 +0x0
  github.com/fleetdm/fleet/v4/orbit/pkg/update.TestMakeRepoPath.func1()
      /home/runner/work/fleet/fleet/orbit/pkg/update/update_test.go:62 +0x1cb
  testing.tRunner()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1439 +0x213
  testing.(*T).Run.func1()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1486 +0x47

Goroutine 15 (running) created at:
  testing.(*T).Run()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1486 +0x724
  github.com/fleetdm/fleet/v4/orbit/pkg/update.TestMakeRepoPath()
      /home/runner/work/fleet/fleet/orbit/pkg/update/update_test.go:53 +0x1a4
  testing.tRunner()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1439 +0x213
  testing.(*T).Run.func1()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1486 +0x47

Goroutine 12 (running) created at:
  testing.(*T).Run()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1486 +0x724
  github.com/fleetdm/fleet/v4/orbit/pkg/update.TestMakeRepoPath()
      /home/runner/work/fleet/fleet/orbit/pkg/update/update_test.go:53 +0x1a4
  testing.tRunner()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1439 +0x213
  testing.(*T).Run.func1()
      /opt/hostedtoolcache/go/1.18.0/x64/src/testing/testing.go:1486
      +0x47
 ```
This commit is contained in:
Zach Wasserman
2022-03-18 09:30:45 -07:00
committed by GitHub
parent 0b4b059e26
commit efbc2b92bb
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orbit/pkg/update/update_test.go
+6 -1
View File
@@ -6,6 +6,7 @@ import (
"testing"
"github.com/fleetdm/fleet/v4/orbit/pkg/constant"
"github.com/jinzhu/copier"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -53,7 +54,11 @@ func TestMakeRepoPath(t *testing.T) {
t.Run(tt.expected, func(t *testing.T) {
t.Parallel()
opt := DefaultOptions
var opt Options
// Must deep copy DefaultOptions, otherwise there is a race condition when modifying the
// opt.Targets map in parallel tests below.
err := copier.CopyWithOption(&opt, DefaultOptions, copier.Option{DeepCopy: true})
require.NoError(t, err)
osqueryd := opt.Targets[tt.name]
osqueryd.Platform = tt.platform
server/datastore/mysql/migrations/tables/20201011162341_CleanupSoftDeletedColumns.go
+2 -2
View File
@@ -56,7 +56,7 @@ func cleanupSoftDeleteFields(tx *sql.Tx, dbTable string) error {
}
func addSoftDeleteFields(tx *sql.Tx, dbTable string) error {
addDeletedStmt := fmt.Sprint(
addDeletedStmt := fmt.Sprintf(
"ALTER TABLE `%s` "+
"ADD COLUMN `deleted` TINYINT(1) NOT NULL DEFAULT FALSE;",
dbTable)
@@ -65,7 +65,7 @@ func addSoftDeleteFields(tx *sql.Tx, dbTable string) error {
return err
}
addDeletedAtStmt := fmt.Sprint(
addDeletedAtStmt := fmt.Sprintf(
"ALTER TABLE `%s` "+
"ADD COLUMN `deleted_at` TIMESTAMP NULL DEFAULT NULL;",
dbTable)