[MM-21378] Add mutex to model.Post to guard against race conditions on Post.Props (#13884)
* Add mutex to model.Post to guard against race conditions on Post.Props * Rename mutex * Add GetProp() method to Post * Fix more tests * Fix flaky test Benchmarks: BenchmarkPostPropsGet_indirect BenchmarkPostPropsGet_indirect-2 85026746 13.0 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsGet_indirect-4 90273747 13.0 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsGet_indirect-8 88324293 13.0 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsGet_indirect-16 91427720 13.1 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsGet_direct BenchmarkPostPropsGet_direct-2 1000000000 0.242 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsGet_direct-4 1000000000 0.241 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsGet_direct-8 1000000000 0.240 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsGet_direct-16 1000000000 0.241 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsAdd_indirect BenchmarkPostPropsAdd_indirect-2 5602224 203 ns/op 336 B/op 2 allocs/op BenchmarkPostPropsAdd_indirect-4 5959496 206 ns/op 336 B/op 2 allocs/op BenchmarkPostPropsAdd_indirect-8 5833999 205 ns/op 336 B/op 2 allocs/op BenchmarkPostPropsAdd_indirect-16 5802493 225 ns/op 336 B/op 2 allocs/op BenchmarkPostPropsAdd_direct BenchmarkPostPropsAdd_direct-2 100000000 11.3 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsAdd_direct-4 100000000 11.3 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsAdd_direct-8 100000000 11.6 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsAdd_direct-16 99840794 11.4 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsDel_indirect BenchmarkPostPropsDel_indirect-2 18824002 61.9 ns/op 48 B/op 1 allocs/op BenchmarkPostPropsDel_indirect-4 19470736 63.8 ns/op 48 B/op 1 allocs/op BenchmarkPostPropsDel_indirect-8 17640460 65.3 ns/op 48 B/op 1 allocs/op BenchmarkPostPropsDel_indirect-16 18692962 65.4 ns/op 48 B/op 1 allocs/op BenchmarkPostPropsDel_direct BenchmarkPostPropsDel_direct-2 516257440 2.34 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsDel_direct-4 514865216 2.43 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsDel_direct-8 511330477 2.37 ns/op 0 B/op 0 allocs/op BenchmarkPostPropsDel_direct-16 499504010 2.38 ns/op 0 B/op 0 allocs/op
Этот коммит содержится в:
Claudio Costa
коммит произвёл
GitHub
GitHub
родитель
9e580361c2
Коммит
1e53fe85ad
@@ -6,6 +6,7 @@ package model
|
||||
import (
|
||||
"io/ioutil"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
@@ -18,7 +19,7 @@ func TestPostToJson(t *testing.T) {
|
||||
ro := PostFromJson(strings.NewReader(j))
|
||||
|
||||
assert.NotNil(t, ro)
|
||||
assert.Equal(t, o, *ro)
|
||||
assert.Equal(t, &o, ro.Clone())
|
||||
}
|
||||
|
||||
func TestPostFromJsonError(t *testing.T) {
|
||||
@@ -124,7 +125,7 @@ func TestPostSanitizeProps(t *testing.T) {
|
||||
|
||||
post1.SanitizeProps()
|
||||
|
||||
require.Nil(t, post1.Props[PROPS_ADD_CHANNEL_MEMBER])
|
||||
require.Nil(t, post1.GetProp(PROPS_ADD_CHANNEL_MEMBER))
|
||||
|
||||
post2 := &Post{
|
||||
Message: "test",
|
||||
@@ -135,7 +136,7 @@ func TestPostSanitizeProps(t *testing.T) {
|
||||
|
||||
post2.SanitizeProps()
|
||||
|
||||
require.Nil(t, post2.Props[PROPS_ADD_CHANNEL_MEMBER])
|
||||
require.Nil(t, post2.GetProp(PROPS_ADD_CHANNEL_MEMBER))
|
||||
|
||||
post3 := &Post{
|
||||
Message: "test",
|
||||
@@ -147,9 +148,9 @@ func TestPostSanitizeProps(t *testing.T) {
|
||||
|
||||
post3.SanitizeProps()
|
||||
|
||||
require.Nil(t, post3.Props[PROPS_ADD_CHANNEL_MEMBER])
|
||||
require.Nil(t, post3.GetProp(PROPS_ADD_CHANNEL_MEMBER))
|
||||
|
||||
require.NotNil(t, post3.Props["attachments"])
|
||||
require.NotNil(t, post3.GetProp("attachments"))
|
||||
}
|
||||
|
||||
func TestPost_AttachmentsEqual(t *testing.T) {
|
||||
@@ -502,6 +503,182 @@ func BenchmarkRewriteImageURLs(b *testing.B) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestPostShallowCopy(t *testing.T) {
|
||||
var dst *Post
|
||||
p := &Post{
|
||||
Id: NewId(),
|
||||
}
|
||||
|
||||
err := p.ShallowCopy(dst)
|
||||
require.Error(t, err)
|
||||
|
||||
dst = &Post{}
|
||||
err = p.ShallowCopy(dst)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, p, dst)
|
||||
require.Condition(t, func() bool {
|
||||
return p != dst
|
||||
})
|
||||
}
|
||||
|
||||
func TestPostClone(t *testing.T) {
|
||||
p := &Post{
|
||||
Id: NewId(),
|
||||
}
|
||||
|
||||
pp := p.Clone()
|
||||
require.Equal(t, p, pp)
|
||||
require.Condition(t, func() bool {
|
||||
return p != pp
|
||||
})
|
||||
require.Condition(t, func() bool {
|
||||
return &p.propsMu != &pp.propsMu
|
||||
})
|
||||
}
|
||||
|
||||
func BenchmarkClonePost(b *testing.B) {
|
||||
p := Post{}
|
||||
for i := 0; i < b.N; i++ {
|
||||
_ = p.Clone()
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkPostPropsGet_indirect(b *testing.B) {
|
||||
p := Post{
|
||||
Props: make(StringInterface),
|
||||
}
|
||||
for i := 0; i < b.N; i++ {
|
||||
_ = p.GetProps()
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkPostPropsGet_direct(b *testing.B) {
|
||||
p := Post{
|
||||
Props: make(StringInterface),
|
||||
}
|
||||
for i := 0; i < b.N; i++ {
|
||||
_ = p.Props
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkPostPropsAdd_indirect(b *testing.B) {
|
||||
p := Post{
|
||||
Props: make(StringInterface),
|
||||
}
|
||||
for i := 0; i < b.N; i++ {
|
||||
p.AddProp("test", "somevalue")
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkPostPropsAdd_direct(b *testing.B) {
|
||||
p := Post{
|
||||
Props: make(StringInterface),
|
||||
}
|
||||
for i := 0; i < b.N; i++ {
|
||||
p.Props["test"] = "somevalue"
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkPostPropsDel_indirect(b *testing.B) {
|
||||
p := Post{
|
||||
Props: make(StringInterface),
|
||||
}
|
||||
p.AddProp("test", "somevalue")
|
||||
for i := 0; i < b.N; i++ {
|
||||
p.DelProp("test")
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkPostPropsDel_direct(b *testing.B) {
|
||||
p := Post{
|
||||
Props: make(StringInterface),
|
||||
}
|
||||
for i := 0; i < b.N; i++ {
|
||||
delete(p.Props, "test")
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkPostPropGet_direct(b *testing.B) {
|
||||
p := Post{
|
||||
Props: make(StringInterface),
|
||||
}
|
||||
p.Props["somekey"] = "somevalue"
|
||||
for i := 0; i < b.N; i++ {
|
||||
_ = p.Props["somekey"]
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkPostPropGet_indirect(b *testing.B) {
|
||||
p := Post{
|
||||
Props: make(StringInterface),
|
||||
}
|
||||
p.Props["somekey"] = "somevalue"
|
||||
for i := 0; i < b.N; i++ {
|
||||
_ = p.GetProp("somekey")
|
||||
}
|
||||
}
|
||||
|
||||
// TestPostPropsDataRace tries to trigger data race conditions related to Post.Props.
|
||||
// It's meant to be run with the -race flag.
|
||||
func TestPostPropsDataRace(t *testing.T) {
|
||||
p := Post{Message: "test"}
|
||||
|
||||
wg := sync.WaitGroup{}
|
||||
wg.Add(7)
|
||||
|
||||
go func() {
|
||||
for i := 0; i < 100; i++ {
|
||||
p.AddProp("test", "test")
|
||||
}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
go func() {
|
||||
for i := 0; i < 100; i++ {
|
||||
_ = p.GetProp("test")
|
||||
}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
go func() {
|
||||
for i := 0; i < 100; i++ {
|
||||
p.AddProp("test", "test2")
|
||||
}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
go func() {
|
||||
for i := 0; i < 100; i++ {
|
||||
_ = p.GetProps()["test"]
|
||||
}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
go func() {
|
||||
for i := 0; i < 100; i++ {
|
||||
p.DelProp("test")
|
||||
}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
go func() {
|
||||
for i := 0; i < 100; i++ {
|
||||
p.SetProps(make(StringInterface))
|
||||
}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
go func() {
|
||||
for i := 0; i < 100; i++ {
|
||||
_ = p.Clone()
|
||||
}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
func Test_findAtChannelMention(t *testing.T) {
|
||||
testCases := []struct {
|
||||
Name string
|
||||
|
||||
Ссылка в новой задаче
Block a user