redis: fix onHostHealthUpdate got called before the cluster is resolv…

…ed. (#8018) Signed-off-by: Henry Yang <hyang@lyft.com>
envoyproxy · Aug 23, 2019 · faad477 · faad477
1 parent 7f97060
commit faad477
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/source/extensions/clusters/redis/redis_cluster_lb.cc b/source/extensions/clusters/redis/redis_cluster_lb.cc
@@ -75,6 +75,11 @@ void RedisClusterLoadBalancerFactory::onHostHealthUpdate() {
  current_shard_vector = shard_vector_;
  }
 
+ // This can get called by cluster initialization before the Redis Cluster topology is resolved.
+ if (!current_shard_vector) {
+ return;
+ }
+
  auto shard_vector = std::make_shared<std::vector<RedisShardSharedPtr>>();
 
  for (auto const& shard : *current_shard_vector) {

diff --git a/test/extensions/clusters/redis/redis_cluster_lb_test.cc b/test/extensions/clusters/redis/redis_cluster_lb_test.cc
@@ -44,6 +44,7 @@ class RedisClusterLoadBalancerTest : public testing::Test {
  factory_ = std::make_shared<RedisClusterLoadBalancerFactory>(random_);
  lb_ = std::make_unique<RedisClusterThreadAwareLoadBalancer>(factory_);
  lb_->initialize();
+ factory_->onHostHealthUpdate();
  }
 
  void validateAssignment(Upstream::HostVector& hosts,