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

add redis init status log #1867

Merged
merged 3 commits into from
Mar 10, 2025
Merged

add redis init status log #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77c9c0a
add redis init status log
rinfx Mar 10, 2025
1e5d5b0
log level adjust
rinfx Mar 10, 2025
c326ebb
Merge branch 'main' into redis-init-log
CH3CHO Mar 10, 2025
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
6 changes: 3 additions & 3 deletions plugins/wasm-go/extensions/ai-cache/cache/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const (

type providerInitializer interface {
ValidateConfig(ProviderConfig) error
CreateProvider(ProviderConfig) (Provider, error)
CreateProvider(ProviderConfig, wrapper.Log) (Provider, error)
}

var (
Expand Down Expand Up @@ -128,12 +128,12 @@ func (c *ProviderConfig) Validate() error {
return nil
}

func CreateProvider(pc ProviderConfig) (Provider, error) {
func CreateProvider(pc ProviderConfig, log wrapper.Log) (Provider, error) {
initializer, has := providerInitializers[pc.typ]
if !has {
return nil, errors.New("unknown provider type: " + pc.typ)
}
return initializer.CreateProvider(pc)
return initializer.CreateProvider(pc, log)
}

type Provider interface {
Expand Down
12 changes: 10 additions & 2 deletions plugins/wasm-go/extensions/ai-cache/cache/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ func (r *redisProviderInitializer) ValidateConfig(cf ProviderConfig) error {
return nil
}

func (r *redisProviderInitializer) CreateProvider(cf ProviderConfig) (Provider, error) {
func (r *redisProviderInitializer) CreateProvider(cf ProviderConfig, log wrapper.Log) (Provider, error) {
rp := redisProvider{
config: cf,
client: wrapper.NewRedisClusterClient(wrapper.FQDNCluster{
FQDN: cf.serviceName,
Host: cf.serviceHost,
Port: int64(cf.servicePort)}),
log: log,
}
err := rp.Init(cf.username, cf.password, cf.timeout)
return &rp, err
Expand All @@ -31,14 +32,21 @@ func (r *redisProviderInitializer) CreateProvider(cf ProviderConfig) (Provider,
type redisProvider struct {
config ProviderConfig
client wrapper.RedisClient
log wrapper.Log
}

func (rp *redisProvider) GetProviderType() string {
return PROVIDER_TYPE_REDIS
}

func (rp *redisProvider) Init(username string, password string, timeout uint32) error {
return rp.client.Init(rp.config.username, rp.config.password, int64(rp.config.timeout), wrapper.WithDataBase(rp.config.database))
err := rp.client.Init(rp.config.username, rp.config.password, int64(rp.config.timeout), wrapper.WithDataBase(rp.config.database))
if rp.client.Ready() {
rp.log.Info("redis init successfully")
} else {
rp.log.Error("redis init failed, will try later")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果现在没有重试逻辑的话，建议把“will try later”删掉。

另外，是不是把 err 也打出来更好？

Copy link
Collaborator Author

@rinfx rinfx Mar 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个error会传到parseConfig阶段，在parseConfig阶段会打印的。如果仅仅是redis初始化没成功，这里不会返回error的

}
return err
}

func (rp *redisProvider) Get(key string, cb wrapper.RedisResponseCallback) error {
Expand Down
2 changes: 1 addition & 1 deletion plugins/wasm-go/extensions/ai-cache/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func (c *PluginConfig) Complete(log wrapper.Log) error {
}
if c.cacheProviderConfig.GetProviderType() != "" {
log.Debugf("cache provider is set to %s", c.cacheProviderConfig.GetProviderType())
c.cacheProvider, err = cache.CreateProvider(*c.cacheProviderConfig)
c.cacheProvider, err = cache.CreateProvider(*c.cacheProviderConfig, log)
if err != nil {
return err
}
Expand Down
10 changes: 8 additions & 2 deletions plugins/wasm-go/extensions/ai-token-ratelimit/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ type LimitConfigItem struct {
timeWindow int64 // 时间窗口大小
}

func initRedisClusterClient(json gjson.Result, config *ClusterKeyRateLimitConfig) error {
func initRedisClusterClient(json gjson.Result, config *ClusterKeyRateLimitConfig, log wrapper.Log) error {
redisConfig := json.Get("redis")
if !redisConfig.Exists() {
return errors.New("missing redis in config")
Expand Down Expand Up @@ -111,7 +111,13 @@ func initRedisClusterClient(json gjson.Result, config *ClusterKeyRateLimitConfig
Port: int64(servicePort),
})
database := int(redisConfig.Get("database").Int())
return config.redisClient.Init(username, password, int64(timeout), wrapper.WithDataBase(database))
err := config.redisClient.Init(username, password, int64(timeout), wrapper.WithDataBase(database))
if config.redisClient.Ready() {
log.Info("redis init successfully")
} else {
log.Error("redis init failed, will try later")
}
return err
}

func parseClusterKeyRateLimitConfig(json gjson.Result, config *ClusterKeyRateLimitConfig) error {
Expand Down
2 changes: 1 addition & 1 deletion plugins/wasm-go/extensions/ai-token-ratelimit/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ type LimitRedisContext struct {
}

func parseConfig(json gjson.Result, config *ClusterKeyRateLimitConfig, log wrapper.Log) error {
err := initRedisClusterClient(json, config)
err := initRedisClusterClient(json, config, log)
if err != nil {
return err
}
Expand Down
6 changes: 6 additions & 0 deletions plugins/wasm-go/pkg/wrapper/redis_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ type RedisResponseCallback func(response resp.Value)

type RedisClient interface {
Init(username, password string, timeout int64, opts ...optionFunc) error
// return whether redis client is ready
Ready() bool
// with this function, you can call redis as if you are using redis-cli
Command(cmds []interface{}, callback RedisResponseCallback) error
Eval(script string, numkeys int, keys, args []interface{}, callback RedisResponseCallback) error
Expand Down Expand Up @@ -183,6 +185,10 @@ func respString(args []interface{}) []byte {
return buf.Bytes()
}

func (c *RedisClusterClient[C]) Ready() bool {
return c.ready
}

func (c *RedisClusterClient[C]) Init(username, password string, timeout int64, opts ...optionFunc) error {
for _, opt := range opts {
opt(&c.option)
Expand Down
Loading