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
9b762a19
Commit
9b762a19
authored
1 year ago
by
Garet Halliday
Browse files
Options
Downloads
Patches
Plain Diff
oh wow it actually works
parent
5f1de41a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/gat/pool/flow.go
+9
-3
9 additions, 3 deletions
lib/gat/pool/flow.go
lib/middleware/middlewares/ps/sync.go
+6
-2
6 additions, 2 deletions
lib/middleware/middlewares/ps/sync.go
test/capturer.go
+1
-1
1 addition, 1 deletion
test/capturer.go
with
16 additions
and
6 deletions
lib/gat/pool/flow.go
+
9
−
3
View file @
9b762a19
...
@@ -2,6 +2,7 @@ package pool
...
@@ -2,6 +2,7 @@ package pool
import
(
import
(
"pggat/lib/bouncer/backends/v0"
"pggat/lib/bouncer/backends/v0"
"pggat/lib/fed"
packets
"pggat/lib/fed/packets/v3.0"
packets
"pggat/lib/fed/packets/v3.0"
"pggat/lib/gat/metrics"
"pggat/lib/gat/metrics"
"pggat/lib/middleware/middlewares/eqp"
"pggat/lib/middleware/middlewares/eqp"
...
@@ -42,6 +43,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
...
@@ -42,6 +43,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
clientParams
:=
client
.
GetInitialParameters
()
clientParams
:=
client
.
GetInitialParameters
()
serverParams
:=
server
.
GetInitialParameters
()
serverParams
:=
server
.
GetInitialParameters
()
var
packet
fed
.
Packet
for
key
,
value
:=
range
clientParams
{
for
key
,
value
:=
range
clientParams
{
// skip already set params
// skip already set params
if
serverParams
[
key
]
==
value
{
if
serverParams
[
key
]
==
value
{
...
@@ -49,7 +52,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
...
@@ -49,7 +52,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
Key
:
key
.
String
(),
Key
:
key
.
String
(),
Value
:
serverParams
[
key
],
Value
:
serverParams
[
key
],
}
}
clientErr
=
client
.
GetConn
()
.
WritePacket
(
p
.
IntoPacket
(
nil
))
packet
=
p
.
IntoPacket
(
packet
)
clientErr
=
client
.
GetConn
()
.
WritePacket
(
packet
)
if
clientErr
!=
nil
{
if
clientErr
!=
nil
{
return
return
}
}
...
@@ -66,7 +70,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
...
@@ -66,7 +70,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
Key
:
key
.
String
(),
Key
:
key
.
String
(),
Value
:
value
,
Value
:
value
,
}
}
clientErr
=
client
.
GetConn
()
.
WritePacket
(
p
.
IntoPacket
(
nil
))
packet
=
p
.
IntoPacket
(
packet
)
clientErr
=
client
.
GetConn
()
.
WritePacket
(
packet
)
if
clientErr
!=
nil
{
if
clientErr
!=
nil
{
return
return
}
}
...
@@ -96,7 +101,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
...
@@ -96,7 +101,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
Key
:
key
.
String
(),
Key
:
key
.
String
(),
Value
:
value
,
Value
:
value
,
}
}
clientErr
=
client
.
GetConn
()
.
WritePacket
(
p
.
IntoPacket
(
nil
))
packet
=
p
.
IntoPacket
(
packet
)
clientErr
=
client
.
GetConn
()
.
WritePacket
(
packet
)
if
clientErr
!=
nil
{
if
clientErr
!=
nil
{
return
return
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/middleware/middlewares/ps/sync.go
+
6
−
2
View file @
9b762a19
...
@@ -12,13 +12,16 @@ func sync(tracking []strutil.CIString, client fed.ReadWriter, c *Client, server
...
@@ -12,13 +12,16 @@ func sync(tracking []strutil.CIString, client fed.ReadWriter, c *Client, server
value
,
hasValue
:=
c
.
parameters
[
name
]
value
,
hasValue
:=
c
.
parameters
[
name
]
expected
,
hasExpected
:=
s
.
parameters
[
name
]
expected
,
hasExpected
:=
s
.
parameters
[
name
]
var
packet
fed
.
Packet
if
value
==
expected
{
if
value
==
expected
{
if
!
c
.
synced
{
if
!
c
.
synced
{
ps
:=
packets
.
ParameterStatus
{
ps
:=
packets
.
ParameterStatus
{
Key
:
name
.
String
(),
Key
:
name
.
String
(),
Value
:
expected
,
Value
:
expected
,
}
}
if
err
:=
client
.
WritePacket
(
ps
.
IntoPacket
(
nil
));
err
!=
nil
{
packet
=
ps
.
IntoPacket
(
packet
)
if
err
:=
client
.
WritePacket
(
packet
);
err
!=
nil
{
return
err
return
err
}
}
}
}
...
@@ -49,7 +52,8 @@ func sync(tracking []strutil.CIString, client fed.ReadWriter, c *Client, server
...
@@ -49,7 +52,8 @@ func sync(tracking []strutil.CIString, client fed.ReadWriter, c *Client, server
Key
:
name
.
String
(),
Key
:
name
.
String
(),
Value
:
expected
,
Value
:
expected
,
}
}
if
err
:=
client
.
WritePacket
(
ps
.
IntoPacket
(
nil
));
err
!=
nil
{
packet
=
ps
.
IntoPacket
(
packet
)
if
err
:=
client
.
WritePacket
(
packet
);
err
!=
nil
{
return
err
return
err
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
test/capturer.go
+
1
−
1
View file @
9b762a19
...
@@ -13,7 +13,7 @@ type Capturer struct {
...
@@ -13,7 +13,7 @@ type Capturer struct {
}
}
func
(
T
*
Capturer
)
WritePacket
(
packet
fed
.
Packet
)
error
{
func
(
T
*
Capturer
)
WritePacket
(
packet
fed
.
Packet
)
error
{
T
.
Packets
=
append
(
T
.
Packets
,
packet
)
T
.
Packets
=
append
(
T
.
Packets
,
bytes
.
Clone
(
packet
)
)
return
nil
return
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