good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pggat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
gfx
pggat
Commits
f9d012be
Commit
f9d012be
authored
1 year ago
by
Garet Halliday
Browse files
Options
Downloads
Patches
Plain Diff
fix backoff and server release
parent
e206d84d
No related branches found
Branches containing commit
Tags
v0.4.0
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/gat/pool/pool.go
+37
-3
37 additions, 3 deletions
lib/gat/pool/pool.go
with
37 additions
and
3 deletions
lib/gat/pool/pool.go
+
37
−
3
View file @
f9d012be
...
...
@@ -3,6 +3,7 @@ package pool
import
(
"errors"
"sync"
"sync/atomic"
"time"
"github.com/google/uuid"
...
...
@@ -24,6 +25,8 @@ type Pool struct {
closed
chan
struct
{}
backingOff
atomic
.
Bool
recipes
map
[
string
]
*
recipe
.
Recipe
clients
map
[
uuid
.
UUID
]
*
Client
clientsByKey
map
[[
8
]
byte
]
*
Client
...
...
@@ -145,6 +148,13 @@ func (T *Pool) removeRecipe(name string) {
func
(
T
*
Pool
)
scaleUp
()
{
backoff
:=
T
.
options
.
ServerReconnectInitialTime
backingOff
:=
false
defer
func
()
{
if
backingOff
{
T
.
backingOff
.
Store
(
false
)
}
}()
for
{
select
{
...
...
@@ -153,6 +163,11 @@ func (T *Pool) scaleUp() {
default
:
}
if
!
backingOff
&&
T
.
backingOff
.
Load
()
{
// already in backoff
return
}
name
,
r
:=
func
()
(
string
,
*
recipe
.
Recipe
)
{
T
.
mu
.
RLock
()
defer
T
.
mu
.
RUnlock
()
...
...
@@ -184,6 +199,13 @@ func (T *Pool) scaleUp() {
return
}
if
!
backingOff
{
if
T
.
backingOff
.
Swap
(
true
)
{
return
}
backingOff
=
true
}
time
.
Sleep
(
backoff
)
backoff
*=
2
...
...
@@ -268,7 +290,7 @@ func (T *Pool) acquireServer(client *Client) *Server {
}
}
func
(
T
*
Pool
)
releaseServer
(
server
*
Server
)
{
func
(
T
*
Pool
)
releaseServer
Slow
(
server
*
Server
)
{
if
T
.
options
.
ServerResetQuery
!=
""
{
server
.
SetState
(
metrics
.
ConnStateRunningResetQuery
,
uuid
.
Nil
)
...
...
@@ -284,6 +306,18 @@ func (T *Pool) releaseServer(server *Server) {
T
.
options
.
Pooler
.
Release
(
server
.
GetID
())
}
func
(
T
*
Pool
)
releaseServer
(
server
*
Server
)
{
if
T
.
options
.
ServerResetQuery
!=
""
{
// we will have to query server, fallback to slow path
go
T
.
releaseServerSlow
(
server
)
return
}
server
.
SetState
(
metrics
.
ConnStateIdle
,
uuid
.
Nil
)
T
.
options
.
Pooler
.
Release
(
server
.
GetID
())
}
func
(
T
*
Pool
)
Serve
(
conn
fed
.
Conn
,
initialParameters
map
[
strutil
.
CIString
]
string
,
...
...
@@ -335,7 +369,7 @@ func (T *Pool) serve(client *Client, initialize bool) error {
if
serverErr
!=
nil
{
T
.
removeServer
(
server
)
}
else
{
T
.
releaseServer
(
server
)
T
.
releaseServer
Slow
(
server
)
}
server
=
nil
}
...
...
@@ -362,7 +396,7 @@ func (T *Pool) serve(client *Client, initialize bool) error {
for
{
if
server
!=
nil
&&
T
.
options
.
ReleaseAfterTransaction
{
client
.
SetState
(
metrics
.
ConnStateIdle
,
uuid
.
Nil
)
go
T
.
releaseServer
(
server
)
// TODO(garet) does this need to be a goroutine
T
.
releaseServer
(
server
)
// TODO(garet) does this need to be a goroutine
server
=
nil
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment