ar0c/goc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: 修复 global id race

Browse Source
This commit is contained in:
lyyyuna 2021-09-09 14:03:54 +08:00 committed by Li Yiyang
parent fae8077705
commit 6a98d955d3
2 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/server/server.go
View File

@ -44,6 +44,7 @@ type gocServer struct {
watchClients sync.Map
idCount int64
idL sync.Mutex
}
type gocCliendId string
@ -152,7 +153,10 @@ func (gs *gocServer) register(c *gin.Context) {
return
}
atomic.AddInt64(&gs.idCount, 1)
gs.idL.Lock()
gs.idCount++
globalId := gs.idCount
gs.idL.Unlock()
genToken := func(i int64) string {
now := time.Now().UnixNano()
@ -165,8 +169,8 @@ func (gs *gocServer) register(c *gin.Context) {
return h
}
token := genToken(gs.idCount)
id := strconv.Itoa(int(gs.idCount))
token := genToken(globalId)
id := strconv.Itoa(int(globalId))
agent := &gocCoveredAgent{
Id: id,

53
tests/e2e/e2e_test.go
View File

@ -73,8 +73,7 @@ var _ = Describe("1 [基础测试]", func() {
By("使用 goc profile get 获取覆盖率")
profileStr := `mode: count
basic2/main.go:8.13,9.6 1 1
basic2/main.go:9.6,12.3 2 2`
basic2/main.go:8.13,9.6 1 1`
time.Sleep(time.Second)
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "goc profile get运行错误")
@ -141,7 +140,7 @@ basic2/main.go:9.6,12.3 2 2`
defer basicC.Stop()
By("再长时间运行 basic2 -f hello")
time.Sleep(time.Microsecond * 100)
time.Sleep(time.Second * 1)
basicC2 := NewLongRunCmd([]string{"./basic2", "-f", "hello"}, dir,
[]string{
"GOC_REGISTER_EXTRA=fantastic", // 额外的注册信息
@ -225,9 +224,11 @@ basic2/main.go:9.6,12.3 2 2`
time.Sleep(time.Second)
By("获取覆盖率")
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 2"))
Eventually(func() {
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 2"))
}, 3*time.Second, 1*time.Second).Should(Succeed())
By("只获取 id=1 的覆盖率")
output, err = RunShortRunCmd([]string{"goc", "profile", "get", "--id", "1"}, dir, nil)
@ -242,9 +243,11 @@ basic2/main.go:9.6,12.3 2 2`
defer basicC3.Stop()
By("只获取 extra=fantastic 的覆盖率")
output, err = RunShortRunCmd([]string{"goc", "profile", "get", "--extra", "fantastic"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 1"), "extra=fantastic 的覆盖率只有 1")
Eventually(func() {
output, err = RunShortRunCmd([]string{"goc", "profile", "get", "--extra", "fantastic"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 1"), "extra=fantastic 的覆盖率只有 1")
}, 3*time.Second, 1*time.Second).Should(Succeed())
By("获取 id=10 的覆盖率")
output, err = RunShortRunCmd([]string{"goc", "profile", "get", "--id", "10"}, dir, nil)
@ -259,17 +262,21 @@ basic2/main.go:9.6,12.3 2 2`
output, err = RunShortRunCmd([]string{"goc", "profile", "clear", "--id", "2"}, dir, nil)
Expect(err).To(BeNil(), "清空覆盖率失败")
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 2"))
Eventually(func() {
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 2"))
}, 3*time.Second, 1*time.Second).Should(Succeed())
By("清空 extra=fantastic 的覆盖率")
output, err = RunShortRunCmd([]string{"goc", "profile", "clear", "--extra", "fantastic"}, dir, nil)
Expect(err).To(BeNil(), "清空覆盖率失败")
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 1"))
Eventually(func() {
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 1"))
}, 3*time.Second, 1*time.Second).Should(Succeed())
By("运行 basic3 -h")
basicC4 := NewLongRunCmd([]string{"./basic3", "-h"}, dir, []string{
@ -278,17 +285,21 @@ basic2/main.go:9.6,12.3 2 2`
basicC4.Run()
defer basicC4.Stop()
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 2"))
Eventually(func() {
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 2"))
}, 3*time.Second, 1*time.Second).Should(Succeed())
By("清空所有的覆盖率")
output, err = RunShortRunCmd([]string{"goc", "profile", "clear"}, dir, nil)
Expect(err).To(BeNil(), "清空覆盖率失败")
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 0"))
Eventually(func() {
output, err = RunShortRunCmd([]string{"goc", "profile", "get"}, dir, nil)
Expect(err).To(BeNil(), "获取覆盖率失败")
Expect(output).To(ContainSubstring("basic3/main.go:8.13,11.2 2 0"))
}, 3*time.Second, 1*time.Second).Should(Succeed())
})
})