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 redis db index option #577

Merged
merged 4 commits into from Jan 29, 2020
Merged

Add redis db index option #577

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8c14a4
Add redis db index option, to let the user choose what database to u…
inuyasha82 Jan 24, 2020
aaf3b1f
Rename dbIdx to databaseIndex
inuyasha82 Jan 29, 2020
ad3d26e
Merge with master
inuyasha82 Jan 29, 2020
0c359af
Fix database name
inuyasha82 Jan 29, 2020
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
22 changes: 17 additions & 5 deletions pkg/scalers/redis_scaler.go
View file
Open in desktop
Expand Up @@ -20,6 +20,8 @@ const (
defaultTargetListLength = 5
defaultRedisAddress = "redis-master.default.svc.cluster.local:6379"
defaultRedisPassword = ""
defaultDbIdx = 0
defaultEnableTLS = false
)

type redisScaler struct {
Expand All @@ -31,6 +33,7 @@ type redisMetadata struct {
listName string
address string
password string
databaseIndex int
enableTLS bool
}

Expand Down Expand Up @@ -86,7 +89,16 @@ func parseRedisMetadata(metadata, resolvedEnv, authParams map[string]string) (*r
}
}

meta.enableTLS = false
meta.databaseIndex = defaultDbIdx
if val, ok := metadata["databaseIndex"]; ok {
dbIndex, err := strconv.ParseInt(val, 10, 64)
if err != nil {
return nil, fmt.Errorf("databaseIndex: parsing error %s", err.Error())
}
meta.databaseIndex = int(dbIndex)
}

meta.enableTLS = defaultEnableTLS
if val, ok := metadata["enableTLS"]; ok {
tls, err := strconv.ParseBool(val)
if err != nil {
Expand All @@ -102,7 +114,7 @@ func parseRedisMetadata(metadata, resolvedEnv, authParams map[string]string) (*r
func (s *redisScaler) IsActive(ctx context.Context) (bool, error) {

length, err := getRedisListLength(
ctx, s.metadata.address, s.metadata.password, s.metadata.listName, s.metadata.enableTLS)
ctx, s.metadata.address, s.metadata.password, s.metadata.listName, s.metadata.databaseIndex, s.metadata.enableTLS)

if err != nil {
redisLog.Error(err, "error")
Expand All @@ -126,7 +138,7 @@ func (s *redisScaler) GetMetricSpecForScaling() []v2beta1.MetricSpec {

// GetMetrics connects to Redis and finds the length of the list
func (s *redisScaler) GetMetrics(ctx context.Context, metricName string, metricSelector labels.Selector) ([]external_metrics.ExternalMetricValue, error) {
listLen, err := getRedisListLength(ctx, s.metadata.address, s.metadata.password, s.metadata.listName, s.metadata.enableTLS)
listLen, err := getRedisListLength(ctx, s.metadata.address, s.metadata.password, s.metadata.listName, s.metadata.databaseIndex, s.metadata.enableTLS)

if err != nil {
redisLog.Error(err, "error getting list length")
Expand All @@ -142,11 +154,11 @@ func (s *redisScaler) GetMetrics(ctx context.Context, metricName string, metricS
return append([]external_metrics.ExternalMetricValue{}, metric), nil
}

func getRedisListLength(ctx context.Context, address string, password string, listName string, enableTLS bool) (int64, error) {
func getRedisListLength(ctx context.Context, address string, password string, listName string, dbIndex int, enableTLS bool) (int64, error) {
options := &redis.Options{
Addr: address,
Password: password,
DB: 0,
DB: dbIndex,
}

if enableTLS == true {
Expand Down