Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:add client && fix etcd config watcher #2

Merged
merged 14 commits into from
Nov 17, 2023
Merged

feat:add client && fix etcd config watcher #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
545da28
feat:add client && fix etcd config watcher
ViolaPioggia Nov 3, 2023
9c3a9cb
Merge branch 'kitex-contrib:main' into main
ViolaPioggia Nov 3, 2023
35943f1
fix:change the order of the deregisteration && change style
ViolaPioggia Nov 6, 2023
68c8b45
fix:update the description of the empty_config
ViolaPioggia Nov 6, 2023
bf87a2f
fix:update onchangeCallback eventType
ViolaPioggia Nov 7, 2023
40cddec
style:gofumpt
ViolaPioggia Nov 8, 2023
76f2f68
feat:update resp to config
ViolaPioggia Nov 9, 2023
b5421a4
fix:fix circuit_breaker default config
ViolaPioggia Nov 9, 2023
7988906
style:change default config
ViolaPioggia Nov 9, 2023
74c3c85
style:delete global defaultConfig
ViolaPioggia Nov 9, 2023
fa9a223
style:change key prefix && register code
ViolaPioggia Nov 15, 2023
9deee18
style:change func name
ViolaPioggia Nov 15, 2023
e8b9d23
style:update retry policy && etcd deregister
ViolaPioggia Nov 17, 2023
75a30f9
style:change policy enable check
ViolaPioggia Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/circuit_breaker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func WithCircuitBreaker(dest, src string, etcdClient etcd.Client, uniqueID int64
for _, f := range opts.EtcdCustomFunctions {
f(&param)
}
key := param.Prefix + "/" + param.Path
key := "/" + param.Prefix + "/" + param.Path
felix021 marked this conversation as resolved.
Show resolved Hide resolved
cbSuite := initCircuitBreaker(key, dest, src, etcdClient, uniqueID)

return []client.Option{
Expand Down
2 changes: 1 addition & 1 deletion client/retry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func WithRetryPolicy(dest, src string, etcdClient etcd.Client, uniqueID int64, o
for _, f := range opts.EtcdCustomFunctions {
f(&param)
}
key := param.Prefix + "/" + param.Path
key := "/" + param.Prefix + "/" + param.Path
rc := initRetryContainer(key, dest, etcdClient, uniqueID)
return []client.Option{
client.WithRetryContainer(rc),
Expand Down
2 changes: 1 addition & 1 deletion client/rpc_timeout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func WithRPCTimeout(dest, src string, etcdClient etcd.Client, uniqueID int64, op
for _, f := range opts.EtcdCustomFunctions {
f(&param)
}
key := param.Prefix + "/" + param.Path
key := "/" + param.Prefix + "/" + param.Path
return []client.Option{
client.WithTimeoutProvider(initRPCTimeoutContainer(key, dest, etcdClient, uniqueID)),
client.WithCloseCallbacks(func() error {
Expand Down
21 changes: 12 additions & 9 deletions etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ import (
"go.uber.org/zap"
)

var (
m sync.Mutex
ctxMap = make(map[string]context.CancelFunc)
)
var m sync.Mutex

type Key struct {
Prefix string
Expand All @@ -56,6 +53,7 @@ type client struct {
prefixTemplate *template.Template
serverPathTemplate *template.Template
clientPathTemplate *template.Template
cancelMap map[string]context.CancelFunc
felix021 marked this conversation as resolved.
Show resolved Hide resolved
}

// Options etcd config options. All the fields have default value.
Expand Down Expand Up @@ -117,6 +115,7 @@ func NewClient(opts Options) (Client, error) {
prefixTemplate: prefixTemplate,
serverPathTemplate: serverNameTemplate,
clientPathTemplate: clientNameTemplate,
cancelMap: make(map[string]context.CancelFunc),
}
return c, nil
}
Expand Down Expand Up @@ -170,10 +169,7 @@ func (c *client) render(cpc *ConfigParamConfig, t *template.Template) (string, e
func (c *client) RegisterConfigCallback(ctx context.Context, key string, uniqueID int64, callback func(bool, string, ConfigParser)) {
go func() {
clientCtx, cancel := context.WithCancel(context.Background())
m.Lock()
clientKey := key + "/" + strconv.FormatInt(uniqueID, 10)
ctxMap[clientKey] = cancel
m.Unlock()
c.register(key, uniqueID, cancel)
watchChan := c.ecli.Watch(ctx, key)
for {
select {
Expand Down Expand Up @@ -214,7 +210,14 @@ func (c *client) RegisterConfigCallback(ctx context.Context, key string, uniqueI
func (c *client) DeregisterConfig(key string, uniqueID int64) {
m.Lock()
clientKey := key + "/" + strconv.FormatInt(uniqueID, 10)
cancel := ctxMap[clientKey]
cancel := c.cancelMap[clientKey]
cancel()
m.Unlock()
}

func (c *client) register(key string, uniqueID int64, cancel context.CancelFunc) {
felix021 marked this conversation as resolved.
Show resolved Hide resolved
m.Lock()
clientKey := key + "/" + strconv.FormatInt(uniqueID, 10)
c.cancelMap[clientKey] = cancel
felix021 marked this conversation as resolved.
Show resolved Hide resolved
m.Unlock()
}
2 changes: 1 addition & 1 deletion server/limiter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func WithLimiter(dest string, etcdClient etcd.Client, uniqueID int64, opts utils
for _, f := range opts.EtcdCustomFunctions {
f(&param)
}
key := param.Prefix + "/" + param.Path
key := "/" + param.Prefix + "/" + param.Path
server.RegisterShutdownHook(func() {
etcdClient.DeregisterConfig(key, uniqueID)
})
Expand Down
Loading