uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-12 02:26:26 +05:00
Code Issues Packages Projects Releases Wiki Activity

Added protection for Redis limit when setting indexes

Browse Source
This commit is contained in:
Trial97
2021-10-12 15:32:53 +03:00
committed by Dan Christian Bogos
parent e6cdf8abf2
commit 5c062e7ea7
2 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
engine/storage_redis.go
View File

@@ -66,10 +66,11 @@ const (
redisHMSET = "HMSET"
redisLoadError = "Redis is loading the dataset in memory"
RedisLimit = 524287 // https://github.com/StackExchange/StackExchange.Redis/issues/201#issuecomment-98639005
)
func NewRedisStorage(address string, db int, user, pass, mrshlerStr string,
maxConns,attempts int, sentinelName string, isCluster bool, clusterSync,
maxConns, attempts int, sentinelName string, isCluster bool, clusterSync,
clusterOnDownDelay time.Duration, tlsConn bool,
tlsClientCert, tlsClientKey, tlsCACert string) (_ *RedisStorage, err error) {
var ms Marshaler
@@ -823,6 +824,12 @@ func (rs *RedisStorage) SetIndexesDrv(ctx *context.Context, idxItmType, tntCtx s
for key, strMp := range indexes {
if len(strMp) == 0 { // remove with no more elements inside
deleteArgs = append(deleteArgs, key)
if len(deleteArgs) == RedisLimit+1 { // minus dbkey
if err = rs.Cmd(nil, redisHDEL, deleteArgs...); err != nil {
return
}
deleteArgs = []string{dbKey} // the dbkey is necesary for the HDEL command
}
continue
}
var encodedMp []byte
@@ -830,6 +837,12 @@ func (rs *RedisStorage) SetIndexesDrv(ctx *context.Context, idxItmType, tntCtx s
return
}
mp[key] = string(encodedMp)
if len(mp) == RedisLimit {
if err = rs.FlatCmd(nil, redisHMSET, dbKey, mp); err != nil {
return
}
mp = make(map[string]string)
}
}
if len(deleteArgs) != 1 {
if err = rs.Cmd(nil, redisHDEL, deleteArgs...); err != nil {

52
general_tests/indexes_redis_it_test.go Normal file
View File

@@ -0,0 +1,52 @@
//go:build integration
// +build integration
/*
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
Copyright (C) ITsysCOM GmbH
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package general_tests
import (
"strconv"
"testing"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
func TestIndexesRedis(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
db, err := engine.NewRedisStorage(cfg.DataDbCfg().Host+":"+cfg.DataDbCfg().Port, 10, cfg.DataDbCfg().User,
cfg.DataDbCfg().Password, cfg.GeneralCfg().DBDataEncoding, utils.RedisMaxConns, utils.RedisMaxAttempts,
utils.EmptyString, false, 0, 0, false, utils.EmptyString, utils.EmptyString, utils.EmptyString)
if err != nil {
t.Fatal(err)
}
defer db.Close()
limit := engine.RedisLimit + 1
indx := make(map[string]utils.StringSet)
for i := 0; i < limit; i++ {
indx["*string:*req.Destination:"+strconv.Itoa(i)] = utils.StringSet{"ATTR_New": {}}
}
if err = db.SetIndexesDrv(context.Background(), utils.CacheAttributeFilterIndexes, "cgrates.org:*any", indx,
false, utils.NonTransactional); err != nil {
t.Fatal(err)
}
}