X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=internal%2Fsdlgoredis%2Fsdlgoredis.go;h=570dfa123760a5d49c65cf7a56021f66dfdb3e86;hb=refs%2Fchanges%2F40%2F6740%2F2;hp=574e7b0a601a9c9b8513a64c56de14fa8c947b84;hpb=97445fe7e6737da5536c5f7a6909821a1612f66c;p=ric-plt%2Fsdlgo.git diff --git a/internal/sdlgoredis/sdlgoredis.go b/internal/sdlgoredis/sdlgoredis.go index 574e7b0..570dfa1 100644 --- a/internal/sdlgoredis/sdlgoredis.go +++ b/internal/sdlgoredis/sdlgoredis.go @@ -25,15 +25,16 @@ package sdlgoredis import ( "errors" "fmt" + "github.com/go-redis/redis" "os" "strconv" "strings" + "sync" "time" - - "github.com/go-redis/redis" ) type ChannelNotificationCb func(channel string, payload ...string) +type RedisClientCreator func(addr, port, clusterName string, isHa bool) RedisClient type intChannels struct { addChannel chan string @@ -41,11 +42,24 @@ type intChannels struct { exit chan bool } +type sharedCbMap struct { + m sync.Mutex + cbMap map[string]ChannelNotificationCb +} + +type Config struct { + hostname string + port string + masterName string + sentinelPort string + clusterAddrList string +} + type DB struct { client RedisClient subscribe SubscribeFn redisModules bool - cbMap map[string]ChannelNotificationCb + sCbMap *sharedCbMap ch intChannels } @@ -97,8 +111,14 @@ func checkIntResultAndError(result interface{}, err error) (bool, error) { if err != nil { return false, err } - if result.(int) == int(1) { - return true, nil + if n, ok := result.(int64); ok { + if n == 1 { + return true, nil + } + } else if n, ok := result.(int); ok { + if n == 1 { + return true, nil + } } return false, nil } @@ -112,7 +132,7 @@ func CreateDB(client RedisClient, subscribe SubscribeFn) *DB { client: client, subscribe: subscribe, redisModules: true, - cbMap: make(map[string]ChannelNotificationCb, 0), + sCbMap: &sharedCbMap{cbMap: make(map[string]ChannelNotificationCb, 0)}, ch: intChannels{ addChannel: make(chan string), removeChannel: make(chan string), @@ -123,41 +143,94 @@ func CreateDB(client RedisClient, subscribe SubscribeFn) *DB { return &db } -func Create() *DB { - var client *redis.Client - hostname := os.Getenv("DBAAS_SERVICE_HOST") - if hostname == "" { - hostname = "localhost" +func Create() []*DB { + osimpl := osImpl{} + return ReadConfigAndCreateDbClients(osimpl, newRedisClient) +} + +func readConfig(osI OS) Config { + cfg := Config{ + hostname: osI.Getenv("DBAAS_SERVICE_HOST", "localhost"), + port: osI.Getenv("DBAAS_SERVICE_PORT", "6379"), + masterName: osI.Getenv("DBAAS_MASTER_NAME", ""), + sentinelPort: osI.Getenv("DBAAS_SERVICE_SENTINEL_PORT", ""), + clusterAddrList: osI.Getenv("DBAAS_CLUSTER_ADDR_LIST", ""), } - port := os.Getenv("DBAAS_SERVICE_PORT") - if port == "" { - port = "6379" + return cfg +} + +type OS interface { + Getenv(key string, defValue string) string +} + +type osImpl struct{} + +func (osImpl) Getenv(key string, defValue string) string { + val := os.Getenv(key) + if val == "" { + val = defValue } - sentinelPort := os.Getenv("DBAAS_SERVICE_SENTINEL_PORT") - masterName := os.Getenv("DBAAS_MASTER_NAME") - if sentinelPort == "" { - redisAddress := hostname + ":" + port - client = redis.NewClient(&redis.Options{ - Addr: redisAddress, - Password: "", // no password set - DB: 0, // use default DB - PoolSize: 20, - MaxRetries: 2, - }) + return val +} + +func ReadConfigAndCreateDbClients(osI OS, clientCreator RedisClientCreator) []*DB { + cfg := readConfig(osI) + return createDbClients(cfg, clientCreator) +} + +func createDbClients(cfg Config, clientCreator RedisClientCreator) []*DB { + if cfg.clusterAddrList == "" { + return []*DB{createLegacyDbClient(cfg, clientCreator)} + } + + dbs := []*DB{} + + addrList := strings.Split(cfg.clusterAddrList, ",") + for _, addr := range addrList { + db := createDbClient(cfg, addr, clientCreator) + dbs = append(dbs, db) + } + return dbs +} + +func createLegacyDbClient(cfg Config, clientCreator RedisClientCreator) *DB { + return createDbClient(cfg, cfg.hostname, clientCreator) +} + +func createDbClient(cfg Config, hostName string, clientCreator RedisClientCreator) *DB { + var client RedisClient + if cfg.sentinelPort == "" { + client = clientCreator(hostName, cfg.port, "", false) } else { - sentinelAddress := hostname + ":" + sentinelPort - client = redis.NewFailoverClient(&redis.FailoverOptions{ - MasterName: masterName, - SentinelAddrs: []string{sentinelAddress}, - PoolSize: 20, - MaxRetries: 2, - }) + client = clientCreator(hostName, cfg.sentinelPort, cfg.masterName, true) } db := CreateDB(client, subscribeNotifications) db.CheckCommands() return db } +func newRedisClient(addr, port, clusterName string, isHa bool) RedisClient { + if isHa == true { + sentinelAddress := addr + ":" + port + return redis.NewFailoverClient( + &redis.FailoverOptions{ + MasterName: clusterName, + SentinelAddrs: []string{sentinelAddress}, + PoolSize: 20, + MaxRetries: 2, + }, + ) + } + redisAddress := addr + ":" + port + return redis.NewClient(&redis.Options{ + Addr: redisAddress, + Password: "", // no password set + DB: 0, // use default DB + PoolSize: 20, + MaxRetries: 2, + }) +} + func (db *DB) CheckCommands() { commands, err := db.client.Command().Result() if err == nil { @@ -180,37 +253,40 @@ func (db *DB) CloseDB() error { func (db *DB) UnsubscribeChannelDB(channels ...string) { for _, v := range channels { + db.sCbMap.Remove(v) db.ch.removeChannel <- v - delete(db.cbMap, v) - if len(db.cbMap) == 0 { + if db.sCbMap.Count() == 0 { db.ch.exit <- true } } } func (db *DB) SubscribeChannelDB(cb func(string, ...string), channelPrefix, eventSeparator string, channels ...string) { - if len(db.cbMap) == 0 { + if db.sCbMap.Count() == 0 { for _, v := range channels { - db.cbMap[v] = cb + db.sCbMap.Add(v, cb) } - go func(cbMap *map[string]ChannelNotificationCb, + go func(sCbMap *sharedCbMap, channelPrefix, eventSeparator string, ch intChannels, channels ...string) { sub := db.subscribe(db.client, channels...) rxChannel := sub.Channel() + lCbMap := sCbMap.GetMapCopy() for { select { case msg := <-rxChannel: - cb, ok := (*cbMap)[msg.Channel] + cb, ok := lCbMap[msg.Channel] if ok { cb(strings.TrimPrefix(msg.Channel, channelPrefix), strings.Split(msg.Payload, eventSeparator)...) } case channel := <-ch.addChannel: + lCbMap = sCbMap.GetMapCopy() sub.Subscribe(channel) case channel := <-ch.removeChannel: + lCbMap = sCbMap.GetMapCopy() sub.Unsubscribe(channel) case exit := <-ch.exit: if exit { @@ -221,11 +297,11 @@ func (db *DB) SubscribeChannelDB(cb func(string, ...string), channelPrefix, even } } } - }(&db.cbMap, channelPrefix, eventSeparator, db.ch, channels...) + }(db.sCbMap, channelPrefix, eventSeparator, db.ch, channels...) } else { for _, v := range channels { - db.cbMap[v] = cb + db.sCbMap.Add(v, cb) db.ch.addChannel <- v } } @@ -293,28 +369,53 @@ func (db *DB) SetIE(key string, oldData, newData interface{}) (bool, error) { return checkResultAndError(db.client.Do("SETIE", key, newData, oldData).Result()) } -func (db *DB) SetIEPub(channel, message, key string, oldData, newData interface{}) (bool, error) { +func (db *DB) SetIEPub(channelsAndEvents []string, key string, oldData, newData interface{}) (bool, error) { if !db.redisModules { - return false, errors.New("Redis deployment not supporting command SETIEPUB") + return false, errors.New("Redis deployment not supporting command SETIEMPUB") } - return checkResultAndError(db.client.Do("SETIEPUB", key, newData, oldData, channel, message).Result()) + capacity := 4 + len(channelsAndEvents) + command := make([]interface{}, 0, capacity) + command = append(command, "SETIEMPUB") + command = append(command, key) + command = append(command, newData) + command = append(command, oldData) + for _, ce := range channelsAndEvents { + command = append(command, ce) + } + return checkResultAndError(db.client.Do(command...).Result()) } -func (db *DB) SetNXPub(channel, message, key string, data interface{}) (bool, error) { +func (db *DB) SetNXPub(channelsAndEvents []string, key string, data interface{}) (bool, error) { if !db.redisModules { - return false, errors.New("Redis deployment not supporting command SETNXPUB") + return false, errors.New("Redis deployment not supporting command SETNXMPUB") + } + capacity := 3 + len(channelsAndEvents) + command := make([]interface{}, 0, capacity) + command = append(command, "SETNXMPUB") + command = append(command, key) + command = append(command, data) + for _, ce := range channelsAndEvents { + command = append(command, ce) } - return checkResultAndError(db.client.Do("SETNXPUB", key, data, channel, message).Result()) + return checkResultAndError(db.client.Do(command...).Result()) } func (db *DB) SetNX(key string, data interface{}, expiration time.Duration) (bool, error) { return db.client.SetNX(key, data, expiration).Result() } -func (db *DB) DelIEPub(channel, message, key string, data interface{}) (bool, error) { +func (db *DB) DelIEPub(channelsAndEvents []string, key string, data interface{}) (bool, error) { if !db.redisModules { - return false, errors.New("Redis deployment not supporting command") + return false, errors.New("Redis deployment not supporting command DELIEMPUB") + } + capacity := 3 + len(channelsAndEvents) + command := make([]interface{}, 0, capacity) + command = append(command, "DELIEMPUB") + command = append(command, key) + command = append(command, data) + for _, ce := range channelsAndEvents { + command = append(command, ce) } - return checkIntResultAndError(db.client.Do("DELIEPUB", key, data, channel, message).Result()) + return checkIntResultAndError(db.client.Do(command...).Result()) } func (db *DB) DelIE(key string, data interface{}) (bool, error) { @@ -367,3 +468,31 @@ func (db *DB) PExpireIE(key string, data interface{}, expiration time.Duration) } return errors.New("Lock not held") } + +func (sCbMap *sharedCbMap) Add(channel string, cb ChannelNotificationCb) { + sCbMap.m.Lock() + defer sCbMap.m.Unlock() + sCbMap.cbMap[channel] = cb +} + +func (sCbMap *sharedCbMap) Remove(channel string) { + sCbMap.m.Lock() + defer sCbMap.m.Unlock() + delete(sCbMap.cbMap, channel) +} + +func (sCbMap *sharedCbMap) Count() int { + sCbMap.m.Lock() + defer sCbMap.m.Unlock() + return len(sCbMap.cbMap) +} + +func (sCbMap *sharedCbMap) GetMapCopy() map[string]ChannelNotificationCb { + sCbMap.m.Lock() + defer sCbMap.m.Unlock() + mapCopy := make(map[string]ChannelNotificationCb, 0) + for i, v := range sCbMap.cbMap { + mapCopy[i] = v + } + return mapCopy +}