use separate redis clients for storage and async engine (#182)

cmd/broker/broker.go

@@ -57,23 +57,33 @@ func main() {
 		},
 	).Info("Open Service Broker for Azure starting")
 
-	// Redis client
+	// Redis clients
 	redisConfig, err := getRedisConfig()
 	if err != nil {
 		log.Fatal(err)
 	}
-	redisOpts := &redis.Options{
+	storageRedisOpts := &redis.Options{
 		Addr:       fmt.Sprintf("%s:%d", redisConfig.Host, redisConfig.Port),
 		Password:   redisConfig.Password,
-		DB:         redisConfig.DB,
+		DB:         redisConfig.StorageDB,
+		MaxRetries: 5,
+	}
+	asyncRedisOpts := &redis.Options{
+		Addr:       fmt.Sprintf("%s:%d", redisConfig.Host, redisConfig.Port),
+		Password:   redisConfig.Password,
+		DB:         redisConfig.AsyncDB,
 		MaxRetries: 5,
 	}
 	if redisConfig.EnableTLS {
-		redisOpts.TLSConfig = &tls.Config{
+		storageRedisOpts.TLSConfig = &tls.Config{
+			ServerName: redisConfig.Host,
+		}
+		asyncRedisOpts.TLSConfig = &tls.Config{
 			ServerName: redisConfig.Host,
 		}
 	}
-	redisClient := redis.NewClient(redisOpts)
+	storageRedisClient := redis.NewClient(storageRedisOpts)
+	asyncRedisClient := redis.NewClient(asyncRedisOpts)
 
 	// Crypto
 	cryptoConfig, err := getCryptoConfig()
@@ -106,7 +116,8 @@ func main() {
 
 	// Create broker
 	broker, err := broker.NewBroker(
-		redisClient,
+		storageRedisClient,
+		asyncRedisClient,
 		codec,
 		authenticator,
 		modules,

cmd/broker/config.go

@@ -22,7 +22,8 @@ type redisConfig struct {
 	Host      string `envconfig:"REDIS_HOST" required:"true"`
 	Port      int    `envconfig:"REDIS_PORT" default:"6379"`
 	Password  string `envconfig:"REDIS_PASSWORD" default:""`
-	DB        int    `envconfig:"REDIS_DB" default:"0"`
+	StorageDB int    `envconfig:"REDIS_STORAGE_DB" default:"0"`
+	AsyncDB   int    `envconfig:"REDIS_ASYNC_DB" default:"1"`
 	EnableTLS bool   `envconfig:"REDIS_ENABLE_TLS" default:"false"`
 }
 

pkg/broker/broker.go

@@ -48,7 +48,8 @@ type broker struct {
 
 // NewBroker returns a new Broker
 func NewBroker(
-	redisClient *redis.Client,
+	storageRedisClient *redis.Client,
+	asyncRedisClient *redis.Client,
 	codec crypto.Codec,
 	authenticator authenticator.Authenticator,
 	modules []service.Module,
@@ -89,8 +90,8 @@ func NewBroker(
 	}
 	catalog := service.NewCatalog(services)
 	b := &broker{
-		store:       storage.NewStore(redisClient, catalog, codec),
-		asyncEngine: async.NewEngine(redisClient),
+		store:       storage.NewStore(storageRedisClient, catalog, codec),
+		asyncEngine: async.NewEngine(asyncRedisClient),
 		catalog:     catalog,
 	}
 

pkg/broker/broker_test.go

@@ -141,6 +141,7 @@ func TestBrokerStartBlocksUntilContextCanceled(t *testing.T) {
 
 func getTestBroker() (*broker, error) {
 	b, err := NewBroker(
+		nil,
 		nil,
 		nil,
 		always.NewAuthenticator(),