go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-01-10 00:29:01 +02:00
Code Issues Releases Activity

Merge pull request #650 from go-kratos/bugfix/container-pool-deadlock

Browse Source 
fix pool deadlock
This commit is contained in:
Windfarer 2020-12-01 18:29:54 +08:00 committed by GitHub
commit 25db576747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/go.yml vendored
View File

@ -92,8 +92,8 @@ jobs:
- name: Set up Env - name: Set up Env
run: | run: |
echo "::set-env name=GOPATH::$(go env GOPATH)" echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
echo "::add-path::$(go env GOPATH)/bin" echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
- name: Check out code into the Go module directory - name: Check out code into the Go module directory
uses: actions/checkout@v2 uses: actions/checkout@v2

1
go.mod
View File

@ -32,6 +32,7 @@ require (
github.com/leodido/go-urn v1.1.0 // indirect github.com/leodido/go-urn v1.1.0 // indirect
github.com/mattn/go-colorable v0.1.4 // indirect github.com/mattn/go-colorable v0.1.4 // indirect
github.com/mattn/go-isatty v0.0.10 // indirect github.com/mattn/go-isatty v0.0.10 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/montanaflynn/stats v0.5.0 github.com/montanaflynn/stats v0.5.0
github.com/openzipkin/zipkin-go v0.2.1 github.com/openzipkin/zipkin-go v0.2.1
github.com/otokaze/mock v0.0.0-20190125081256-8282b7a7c7c3 github.com/otokaze/mock v0.0.0-20190125081256-8282b7a7c7c3

2
go.sum
View File

@ -465,8 +465,6 @@ google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRn
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=
google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k= google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=

1
pkg/container/pool/list.go
View File

@ -50,7 +50,6 @@ func NewList(c *Config) *List {
// Reload reload config. // Reload reload config.
func (p *List) Reload(c *Config) error { func (p *List) Reload(c *Config) error {
p.mu.Lock() p.mu.Lock()
p.startCleanerLocked(time.Duration(c.IdleTimeout))
p.conf = c p.conf = c
p.mu.Unlock() p.mu.Unlock()
return nil return nil

5
pkg/container/pool/slice.go
View File

@ -61,7 +61,6 @@ func NewSlice(c *Config) *Slice {
// Reload reload config. // Reload reload config.
func (p *Slice) Reload(c *Config) error { func (p *Slice) Reload(c *Config) error {
p.mu.Lock() p.mu.Lock()
p.startCleanerLocked(time.Duration(c.IdleTimeout))
p.setActive(c.Active) p.setActive(c.Active)
p.setIdle(c.Idle) p.setIdle(c.Idle)
p.conf = c p.conf = c
@ -260,7 +259,6 @@ func (p *Slice) openNewItem(ctx context.Context) {
// //
// If n <= 0, no idle items are retained. // If n <= 0, no idle items are retained.
func (p *Slice) setIdle(n int) { func (p *Slice) setIdle(n int) {
p.mu.Lock()
if n > 0 { if n > 0 {
p.conf.Idle = n p.conf.Idle = n
} else { } else {
@ -278,7 +276,6 @@ func (p *Slice) setIdle(n int) {
closing = p.freeItem[maxIdle:] closing = p.freeItem[maxIdle:]
p.freeItem = p.freeItem[:maxIdle] p.freeItem = p.freeItem[:maxIdle]
} }
p.mu.Unlock()
for _, c := range closing { for _, c := range closing {
c.close() c.close()
} }
@ -293,13 +290,11 @@ func (p *Slice) setIdle(n int) {
// If n <= 0, then there is no limit on the number of open items. // If n <= 0, then there is no limit on the number of open items.
// The default is 0 (unlimited). // The default is 0 (unlimited).
func (p *Slice) setActive(n int) { func (p *Slice) setActive(n int) {
p.mu.Lock()
p.conf.Active = n p.conf.Active = n
if n < 0 { if n < 0 {
p.conf.Active = 0 p.conf.Active = 0
} }
syncIdle := p.conf.Active > 0 && p.maxIdleItemsLocked() > p.conf.Active syncIdle := p.conf.Active > 0 && p.maxIdleItemsLocked() > p.conf.Active
p.mu.Unlock()
if syncIdle { if syncIdle {
p.setIdle(n) p.setIdle(n)
} }