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

Jump to bottom

Add configurable Redis DbIndex #6271

Merged
merged 1 commit into from
Sep 9, 2022
Merged

Add configurable Redis DbIndex #6271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions engine/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ TEST_DB_START_DOCKER = docker run -d -p $(TEST_DB_PORT):5432 -e POSTGRES_PASSWOR
TEST_REDIS_PORT = 6379
TEST_REDIS_HOST = $(if ${CDS_CACHE_REDIS_HOST},${CDS_CACHE_REDIS_HOST},localhost:$(TEST_REDIS_PORT))
TEST_REDIS_PASS = $(if ${CDS_CACHE_REDIS_PASS},${CDS_CACHE_REDIS_PASS},)
TEST_REDIS_DBINDEX = 0
TEST_REDIS_START_DOCKER = docker run -d -p $(TEST_REDIS_PORT):6379 --name redis-cds redis:5

TEST_KAFKA_START_DOCKER = docker run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_HOST=localhost --env ADVERTISED_PORT=9092 --name kafka-cds spotify/kafka
Expand Down Expand Up @@ -148,11 +149,11 @@ test-config: ${HOME}/.cds/api.tests.cfg.json ${HOME}/.cds/cdn.tests.cfg.json

${HOME}/.cds/api.tests.cfg.json:
@mkdir -p ${HOME}/.cds
@echo "{\"dbDriver\": \"postgres\", \"dbUser\" :\"$(TEST_DB_USER)\", \"dbPassword\" :\"$(TEST_DB_PASS)\" ,\"dbName\": \"$(TEST_DB_NAME)\", \"dbSchema\": \"$(TEST_API_DB_SCHEMA)\", \"dbHost\": \"$(TEST_DB_HOST)\", \"dbPort\" : \"$(TEST_DB_PORT)\", \"sslMode\": \"disable\", \"redisHost\" : \"$(TEST_REDIS_HOST)\", \"redisPassword\" : \"$(TEST_REDIS_PASSWORD)\"}" > ${HOME}/.cds/api.tests.cfg.json
@echo "{\"dbDriver\": \"postgres\", \"dbUser\" :\"$(TEST_DB_USER)\", \"dbPassword\" :\"$(TEST_DB_PASS)\" ,\"dbName\": \"$(TEST_DB_NAME)\", \"dbSchema\": \"$(TEST_API_DB_SCHEMA)\", \"dbHost\": \"$(TEST_DB_HOST)\", \"dbPort\" : \"$(TEST_DB_PORT)\", \"sslMode\": \"disable\", \"redisHost\" : \"$(TEST_REDIS_HOST)\", \"redisPassword\" : \"$(TEST_REDIS_PASSWORD)\", \"redisDbIndex\" : \"$(TEST_REDIS_DBINDEX)\"}" > ${HOME}/.cds/api.tests.cfg.json

${HOME}/.cds/cdn.tests.cfg.json:
@mkdir -p ${HOME}/.cds
@echo "{\"dbDriver\": \"postgres\", \"dbUser\" :\"$(TEST_DB_USER)\", \"dbPassword\" :\"$(TEST_DB_PASS)\" ,\"dbName\": \"$(TEST_DB_NAME)\", \"dbSchema\": \"$(TEST_CDN_DB_SCHEMA)\", \"dbHost\": \"$(TEST_DB_HOST)\", \"dbPort\" : \"$(TEST_DB_PORT)\", \"sslMode\": \"disable\", \"redisHost\" : \"$(TEST_REDIS_HOST)\", \"redisPassword\" : \"$(TEST_REDIS_PASSWORD)\"}" > ${HOME}/.cds/cdn.tests.cfg.json
@echo "{\"dbDriver\": \"postgres\", \"dbUser\" :\"$(TEST_DB_USER)\", \"dbPassword\" :\"$(TEST_DB_PASS)\" ,\"dbName\": \"$(TEST_DB_NAME)\", \"dbSchema\": \"$(TEST_CDN_DB_SCHEMA)\", \"dbHost\": \"$(TEST_DB_HOST)\", \"dbPort\" : \"$(TEST_DB_PORT)\", \"sslMode\": \"disable\", \"redisHost\" : \"$(TEST_REDIS_HOST)\", \"redisPassword\" : \"$(TEST_REDIS_PASSWORD)\", \"redisDbIndex\" : \"$(TEST_REDIS_DBINDEX)\"}" > ${HOME}/.cds/cdn.tests.cfg.json

# Build a list of the first level of package in the 'engine' package, then remove the '.', 'dist' and 'sql'
TEST_COMPONENTS = $(addprefix test-component-,$(filter-out sql,$(filter-out dist,$(filter-out .,$(shell find . -maxdepth 1 -type d -exec basename {} \;)))))
Expand Down
2 changes: 2 additions & 0 deletions engine/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ type Configuration struct {
Redis struct {
Host string `toml:"host" default:"localhost:6379" comment:"If your want to use a redis-sentinel based cluster, follow this syntax! <clustername>@sentinel1:26379,sentinel2:26379,sentinel3:26379" json:"host"`
Password string `toml:"password" json:"-"`
DbIndex int `toml:"dbindex" default:"0" json:"dbindex"`
} `toml:"redis" comment:"Connect CDS to a redis cache If you more than one CDS instance and to avoid losing data at startup" json:"redis"`
} `toml:"cache" comment:"######################\n CDS Cache Settings \n#####################" json:"cache"`
Download struct {
Expand Down Expand Up @@ -535,6 +536,7 @@ func (a *API) Serve(ctx context.Context) error {
a.Cache, err = cache.New(
a.Config.Cache.Redis.Host,
a.Config.Cache.Redis.Password,
a.Config.Cache.Redis.DbIndex,
a.Config.Cache.TTL)
if err != nil {
return sdk.WrapError(err, "cannot connect to cache store")
Expand Down
4 changes: 2 additions & 2 deletions engine/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ type SetValueWithScore struct {
}

//New init a cache
func New(redisHost, redisPassword string, TTL int) (Store, error) {
return NewRedisStore(redisHost, redisPassword, TTL)
func New(redisHost, redisPassword string, dbindex, TTL int) (Store, error) {
return NewRedisStore(redisHost, redisPassword, dbindex, TTL)
}

//NewWriteCloser returns a write closer
Expand Down
5 changes: 3 additions & 2 deletions engine/cache/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type RedisStore struct {
}

//NewRedisStore initiate a new redisStore
func NewRedisStore(host, password string, ttl int) (*RedisStore, error) {
func NewRedisStore(host, password string, dbindex, ttl int) (*RedisStore, error) {
var client *redis.Client

//if host is line master@localhost:26379,localhost:26380 => it's a redis sentinel cluster
Expand All @@ -38,6 +38,7 @@ func NewRedisStore(host, password string, ttl int) (*RedisStore, error) {
MasterName: masterName,
SentinelAddrs: sentinels,
Password: password,
DB: dbindex,
IdleCheckFrequency: 10 * time.Second,
IdleTimeout: 10 * time.Second,
PoolSize: 25,
Expand All @@ -50,7 +51,7 @@ func NewRedisStore(host, password string, ttl int) (*RedisStore, error) {
client = redis.NewClient(&redis.Options{
Addr: host,
Password: password, // no password set
DB: 0, // use default DB
DB: dbindex,
IdleCheckFrequency: 30 * time.Second,
MaxRetries: 10,
MinRetryBackoff: 30 * time.Millisecond,
Expand Down
13 changes: 10 additions & 3 deletions engine/cache/redis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cache

import (
"context"
"strconv"
"testing"
"time"

Expand All @@ -17,7 +18,9 @@ func TestSortedSet(t *testing.T) {
cfg := testConfig.LoadTestingConf(t, sdk.TypeAPI)
redisHost := cfg["redisHost"]
redisPassword := cfg["redisPassword"]
s, err := NewRedisStore(redisHost, redisPassword, 60)
redisDbIndex, err := strconv.ParseInt(cfg["redisDbIndex"], 10, 64)
require.NoError(t, err, "error when unmarshal config")
s, err := NewRedisStore(redisHost, redisPassword, int(redisDbIndex), 60)
require.NoError(t, err)

s.Delete("test")
Expand All @@ -33,7 +36,9 @@ func TestDequeueJSONRawMessagesWithContext(t *testing.T) {
cfg := testConfig.LoadTestingConf(t, sdk.TypeAPI)
redisHost := cfg["redisHost"]
redisPassword := cfg["redisPassword"]
s, err := NewRedisStore(redisHost, redisPassword, 60)
redisDbIndex, err := strconv.ParseInt(cfg["redisDbIndex"], 10, 64)
require.NoError(t, err, "error when unmarshal config")
s, err := NewRedisStore(redisHost, redisPassword, int(redisDbIndex), 60)
require.NoError(t, err)

s.Delete("test")
Expand Down Expand Up @@ -71,7 +76,9 @@ func TestDequeueJSONRawMessagesWithContextMaxTimeout(t *testing.T) {
cfg := testConfig.LoadTestingConf(t, sdk.TypeAPI)
redisHost := cfg["redisHost"]
redisPassword := cfg["redisPassword"]
s, err := NewRedisStore(redisHost, redisPassword, 60)
redisDbIndex, err := strconv.ParseInt(cfg["redisDbIndex"], 10, 64)
require.NoError(t, err, "error when unmarshal config")
s, err := NewRedisStore(redisHost, redisPassword, int(redisDbIndex), 60)
require.NoError(t, err)

s.Delete("test")
Expand Down
4 changes: 2 additions & 2 deletions engine/cdn/cdn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (s *Service) Start(ctx context.Context) error {

var err error
log.Info(ctx, "Initializing redis cache on %s...", s.Cfg.Cache.Redis.Host)
s.Cache, err = cache.New(s.Cfg.Cache.Redis.Host, s.Cfg.Cache.Redis.Password, s.Cfg.Cache.TTL)
s.Cache, err = cache.New(s.Cfg.Cache.Redis.Host, s.Cfg.Cache.Redis.Password, s.Cfg.Cache.Redis.DbIndex, s.Cfg.Cache.TTL)
if err != nil {
return sdk.WrapError(err, "cannot connect to redis instance")
}
Expand All @@ -140,7 +140,7 @@ func (s *Service) Start(ctx context.Context) error {
storage.InitDBMapping(s.Mapper)

log.Info(ctx, "Initializing lru connection...")
s.LogCache, err = lru.NewRedisLRU(s.mustDBWithCtx(ctx), s.Cfg.Cache.LruSize, s.Cfg.Cache.Redis.Host, s.Cfg.Cache.Redis.Password)
s.LogCache, err = lru.NewRedisLRU(s.mustDBWithCtx(ctx), s.Cfg.Cache.LruSize, s.Cfg.Cache.Redis.Host, s.Cfg.Cache.Redis.Password, s.Cfg.Cache.Redis.DbIndex)
if err != nil {
return sdk.WrapError(err, "cannot connect to redis instance for lru")
}
Expand Down
4 changes: 3 additions & 1 deletion engine/cdn/cdn_gc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func TestCleanSynchronizedItem(t *testing.T) {
Redis: &storage.RedisBufferConfiguration{
Host: cfg["redisHost"],
Password: cfg["redisPassword"],
DbIndex: 0,
},
BufferType: storage.CDNBufferTypeLog,
},
Expand Down Expand Up @@ -184,6 +185,7 @@ func TestCleanSynchronizedItemWithDisabledStorage(t *testing.T) {
Redis: &storage.RedisBufferConfiguration{
Host: cfg["redisHost"],
Password: cfg["redisPassword"],
DbIndex: 0,
},
BufferType: storage.CDNBufferTypeLog,
},
Expand Down Expand Up @@ -385,7 +387,7 @@ func TestPurgeItem(t *testing.T) {

var err error
cfg := test.LoadTestingConf(t, sdk.TypeCDN)
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"])
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"], 0)
require.NoError(t, err)

// Add Item in CDS and FS
Expand Down
8 changes: 4 additions & 4 deletions engine/cdn/cdn_item_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestGetItemValue(t *testing.T) {
cdnUnits := newRunningStorageUnits(t, m, s.DBConnectionFactory.GetDBMap(m)(), ctx, cache)
s.Units = cdnUnits
var err error
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"])
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"], 0)
require.NoError(t, err)
require.NoError(t, s.LogCache.Clear())

Expand Down Expand Up @@ -209,7 +209,7 @@ func TestGetItemValue_ThousandLines(t *testing.T) {
cdnUnits := newRunningStorageUnits(t, m, db.DbMap, ctx, cache)
s.Units = cdnUnits
var err error
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"])
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"], 0)
require.NoError(t, err)
require.NoError(t, s.LogCache.Clear())

Expand Down Expand Up @@ -316,7 +316,7 @@ func TestGetItemValue_Reverse(t *testing.T) {
cdnUnits := newRunningStorageUnits(t, m, db.DbMap, ctx, cache)
s.Units = cdnUnits
var err error
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"])
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"], 0)
require.NoError(t, err)
require.NoError(t, s.LogCache.Clear())

Expand Down Expand Up @@ -426,7 +426,7 @@ func TestGetItemValue_ThousandLinesReverse(t *testing.T) {
cdnUnits := newRunningStorageUnits(t, m, db.DbMap, ctx, cache)
s.Units = cdnUnits
var err error
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"])
s.LogCache, err = lru.NewRedisLRU(db.DbMap, 1000, cfg["redisHost"], cfg["redisPassword"], 0)
require.NoError(t, err)
require.NoError(t, s.LogCache.Clear())

Expand Down
1 change: 1 addition & 0 deletions engine/cdn/cdn_sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ func TestSyncBuffer(t *testing.T) {
Redis: &storage.RedisBufferConfiguration{
Host: cfg["redisHost"],
Password: cfg["redisPassword"],
DbIndex: 0,
},
BufferType: storage.CDNBufferTypeLog,
},
Expand Down
1 change: 1 addition & 0 deletions engine/cdn/cdn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ func newRunningStorageUnits(t *testing.T, m *gorpmapper.Mapper, dbMap *gorp.DbMa
Redis: &storage.RedisBufferConfiguration{
Host: cfg["redisHost"],
Password: cfg["redisPassword"],
DbIndex: 0,
},
BufferType: storage.CDNBufferTypeLog,
},
Expand Down
1 change: 1 addition & 0 deletions engine/cdn/item_upload_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func TestPostUploadHandler(t *testing.T) {
Redis: &storage.RedisBufferConfiguration{
Host: cfg["redisHost"],
Password: cfg["redisPassword"],
DbIndex: 0,
},
BufferType: storage.CDNBufferTypeLog,
},
Expand Down
4 changes: 2 additions & 2 deletions engine/cdn/lru/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ type Redis struct {
}

// NewRedisLRU instanciates a new Redis LRU
func NewRedisLRU(db *gorp.DbMap, maxSize int64, host string, password string) (*Redis, error) {
c, err := cache.New(host, password, -1)
func NewRedisLRU(db *gorp.DbMap, maxSize int64, host string, password string, dbindex int) (*Redis, error) {
c, err := cache.New(host, password, dbindex, -1)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion engine/cdn/lru/redis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestRedisLRU(t *testing.T) {
cdntest.ClearItem(t, context.TODO(), m, db)

cfg := test.LoadTestingConf(t, sdk.TypeCDN)
r, err := NewRedisLRU(db.DbMap, 100, cfg["redisHost"], cfg["redisPassword"])
r, err := NewRedisLRU(db.DbMap, 100, cfg["redisHost"], cfg["redisPassword"], 0)
require.NoError(t, err)

l, _ := r.Len()
Expand Down
2 changes: 1 addition & 1 deletion engine/cdn/redis/reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
func TestReader_EOF(t *testing.T) {
cfg := test.LoadTestingConf(t, sdk.TypeCDN)

c, err := cache.New(cfg["redisHost"], cfg["redisPassword"], -1)
c, err := cache.New(cfg["redisHost"], cfg["redisPassword"], 0, -1)
require.NoError(t, err)

cacheKey := cache.Key("test:cdn:item")
Expand Down
2 changes: 1 addition & 1 deletion engine/cdn/redis/writer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

func TestWriter_Closed(t *testing.T) {
cfg := test.LoadTestingConf(t, sdk.TypeCDN)
c, err := cache.New(cfg["redisHost"], cfg["redisPassword"], -1)
c, err := cache.New(cfg["redisHost"], cfg["redisPassword"], 0, -1)
require.NoError(t, err)

cacheKey := cache.Key("test:cdn:item")
Expand Down
1 change: 1 addition & 0 deletions engine/cdn/storage/dao_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func TestLoadAllItemIDUnknownByUnit(t *testing.T) {
Redis: &storage.RedisBufferConfiguration{
Host: cfg["redisHost"],
Password: cfg["redisPassword"],
DbIndex: 0,
},
BufferType: storage.CDNBufferTypeLog,
},
Expand Down
2 changes: 1 addition & 1 deletion engine/cdn/storage/redis/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (s *Redis) Init(_ context.Context, cfg interface{}, bufferType storage.CDNB
}
s.config = *config
var err error
s.store, err = cache.New(s.config.Host, s.config.Password, 60)
s.store, err = cache.New(s.config.Host, s.config.Password, s.config.DbIndex, 60)
if err != nil {
return err
}
Expand Down
2 changes: 2 additions & 0 deletions engine/cdn/storage/storageunit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func TestDeduplicationCrossType(t *testing.T) {
Redis: &storage.RedisBufferConfiguration{
Host: cfg["redisHost"],
Password: cfg["redisPassword"],
DbIndex: 0,
},
BufferType: storage.CDNBufferTypeLog,
},
Expand Down Expand Up @@ -250,6 +251,7 @@ func TestRun(t *testing.T) {
Redis: &storage.RedisBufferConfiguration{
Host: cfg["redisHost"],
Password: cfg["redisPassword"],
DbIndex: 0,
},
BufferType: storage.CDNBufferTypeLog,
},
Expand Down
1 change: 1 addition & 0 deletions engine/cdn/storage/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ type WebdavStorageConfiguration struct {
type RedisBufferConfiguration struct {
Host string `toml:"host" comment:"If your want to use a redis-sentinel based cluster, follow this syntax ! <clustername>@sentinel1:26379,sentinel2:26379sentinel3:26379" json:"host"`
Password string `toml:"password" json:"-"`
DbIndex int `toml:"dbindex" default:"0" json:"dbindex"`
}

type LocalBufferConfiguration struct {
Expand Down
1 change: 1 addition & 0 deletions engine/cdn/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ type Configuration struct {
Redis struct {
Host string `toml:"host" default:"localhost:6379" comment:"If your want to use a redis-sentinel based cluster, follow this syntax ! <clustername>@sentinel1:26379,sentinel2:26379sentinel3:26379" json:"host"`
Password string `toml:"password" json:"-"`
DbIndex int `toml:"dbindex" default:"0" json:"dbindex"`
} `toml:"redis" json:"redis"`
} `toml:"cache" comment:"######################\n CDN Cache Settings \n######################" json:"cache"`
API service.APIServiceConfiguration `toml:"api" comment:"######################\n CDS API Settings \n######################" json:"api"`
Expand Down
1 change: 1 addition & 0 deletions engine/cdn/unit_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ func TestPostAdminResyncBackendWithDatabaseHandler(t *testing.T) {
Redis: &storage.RedisBufferConfiguration{
Host: cfg["redisHost"],
Password: cfg["redisPassword"],
DbIndex: 0,
},
BufferType: storage.CDNBufferTypeLog,
},
Expand Down
2 changes: 1 addition & 1 deletion engine/hooks/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (s *Service) Serve(c context.Context) error {

//Init the cache
var errCache error
s.Cache, errCache = cache.New(s.Cfg.Cache.Redis.Host, s.Cfg.Cache.Redis.Password, s.Cfg.Cache.TTL)
s.Cache, errCache = cache.New(s.Cfg.Cache.Redis.Host, s.Cfg.Cache.Redis.Password, s.Cfg.Cache.Redis.DbIndex, s.Cfg.Cache.TTL)
if errCache != nil {
return fmt.Errorf("Cannot connect to redis instance : %v", errCache)
}
Expand Down
7 changes: 6 additions & 1 deletion engine/hooks/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package hooks

import (
"strconv"
"testing"

"github.com/golang/mock/gomock"
Expand All @@ -16,10 +17,14 @@ func setupTestHookService(t *testing.T) (Service, func()) {
cfg := test.LoadTestingConf(t, sdk.TypeAPI)
redisHost := cfg["redisHost"]
redisPassword := cfg["redisPassword"]
redisDbIndex, err := strconv.ParseInt(cfg["redisDbIndex"], 10, 64)
if err != nil {
t.Fatalf("redis configuration db index invalid %v", err)
}

s.Cfg.RetryError = 1

store, err := cache.NewRedisStore(redisHost, redisPassword, 60)
store, err := cache.NewRedisStore(redisHost, redisPassword, int(redisDbIndex), 60)
if err != nil {
t.Fatalf("Unable to connect to redis: %v", err)
}
Expand Down
2 changes: 2 additions & 0 deletions engine/hooks/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package hooks

import (
"crypto/rsa"

"github.com/ovh/cds/engine/api"
"github.com/ovh/cds/engine/cache"
"github.com/ovh/cds/engine/service"
Expand Down Expand Up @@ -42,6 +43,7 @@ type Configuration struct {
Redis struct {
Host string `toml:"host" default:"localhost:6379" comment:"If your want to use a redis-sentinel based cluster, follow this syntax! <clustername>@sentinel1:26379,sentinel2:26379,sentinel3:26379" json:"host"`
Password string `toml:"password" json:"-"`
DbIndex int `toml:"dbindex" default:"0" json:"dbindex"`
} `toml:"redis" comment:"Connect CDS to a redis cache If you more than one CDS instance and to avoid losing data at startup" json:"redis"`
} `toml:"cache" comment:"######################\n CDS Hooks Cache Settings \n######################" json:"cache"`
WebhooksPublicKeySign string `toml:"webhooksPublicKeySign" comment:"Public key to check call signature on handler /v2/webhook/repository"`
Expand Down
2 changes: 1 addition & 1 deletion engine/repositories/repositories.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func (s *Service) Serve(c context.Context) error {
//Init the cache
log.Info(ctx, "Initializing Redis connection (%s)...", s.Cfg.Cache.Redis.Host)
var errCache error
s.Cache, errCache = cache.New(s.Cfg.Cache.Redis.Host, s.Cfg.Cache.Redis.Password, s.Cfg.Cache.TTL)
s.Cache, errCache = cache.New(s.Cfg.Cache.Redis.Host, s.Cfg.Cache.Redis.Password, s.Cfg.Cache.Redis.DbIndex, s.Cfg.Cache.TTL)
if errCache != nil {
return fmt.Errorf("cannot connect to redis instance : %v", errCache)
}
Expand Down
3 changes: 2 additions & 1 deletion engine/repositories/repositories_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func newTestService(t *testing.T) (*Service, error) {
cfg.Cache.TTL = 30
cfg.Cache.Redis.Host = RedisHost
cfg.Cache.Redis.Password = RedisPassword
cfg.Cache.Redis.DbIndex = 0

ctx := context.Background()
r := &api.Router{
Expand All @@ -64,7 +65,7 @@ func newTestService(t *testing.T) (*Service, error) {

//Init the cache
var errCache error
service.Cache, errCache = cache.New(service.Cfg.Cache.Redis.Host, service.Cfg.Cache.Redis.Password, service.Cfg.Cache.TTL)
service.Cache, errCache = cache.New(service.Cfg.Cache.Redis.Host, service.Cfg.Cache.Redis.Password, service.Cfg.Cache.Redis.DbIndex, service.Cfg.Cache.TTL)
if errCache != nil {
log.Error(ctx, "Unable to init cache (%s): %v", service.Cfg.Cache.Redis.Host, errCache)
return nil, errCache
Expand Down
1 change: 1 addition & 0 deletions engine/repositories/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type Configuration struct {
Redis struct {
Host string `toml:"host" default:"localhost:6379" comment:"If your want to use a redis-sentinel based cluster, follow this syntax! <clustername>@sentinel1:26379,sentinel2:26379,sentinel3:26379" json:"host"`
Password string `toml:"password" json:"-"`
DbIndex int `toml:"dbindex" default:"0" json:"dbindex"`
} `toml:"redis" json:"redis"`
} `toml:"cache" comment:"######################\n CDS Repositories Cache Settings \n######################" json:"cache"`
}
Expand Down