Skip to content

redis cluster: fix ClusterSlot operator == #16116

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

Merged
snowp merged 11 commits into from
May 17, 2021
Merged

redis cluster: fix ClusterSlot operator == #16116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5c326e9
redis cluster: fix ClusterSlot operator ==
gaoliangdut Apr 22, 2021
c6f431f
redis cluster: remove else
gaoliangdut Apr 23, 2021
6dbef99
redis cluster: fix replicas compare
gaoliangdut Apr 23, 2021
bb75fe2
redis cluster: use equality function
gaoliangdut Apr 25, 2021
4c19890
redis cluster: change flat_hash_set to map
gaoliangdut Apr 28, 2021
6594417
redis cluster: compare with std::equal
gaoliangdut Apr 29, 2021
732d8e7
change std::map to absl::btree_map
gaoliangdut May 10, 2021
46e9ff6
Kick CI
gaoliangdut May 11, 2021
ba8b162
add a comment for ClusterSlot compare
gaoliangdut May 13, 2021
61e7bc4
Merge branch 'envoyproxy:main' into main
gaoliangdut May 16, 2021
fa55163
Kick CI
gaoliangdut May 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/extensions/clusters/redis/redis_cluster.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ void RedisCluster::onClusterSlotUpdate(ClusterSlotsPtr&& slots) {
new_hosts.emplace_back(new RedisHost(info(), "", slot.primary(), *this, true, time_source_));
all_new_hosts.emplace(slot.primary()->asString());
for (auto const& replica : slot.replicas()) {
new_hosts.emplace_back(new RedisHost(info(), "", replica, *this, false, time_source_));
all_new_hosts.emplace(replica->asString());
new_hosts.emplace_back(new RedisHost(info(), "", replica.second, *this, false, time_source_));
all_new_hosts.emplace(replica.first);
}
}

Expand Down
12 changes: 9 additions & 3 deletions source/extensions/clusters/redis/redis_cluster_lb.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@ namespace Clusters {
namespace Redis {

bool ClusterSlot::operator==(const Envoy::Extensions::Clusters::Redis::ClusterSlot& rhs) const {
return start_ == rhs.start_ && end_ == rhs.end_ && primary_ == rhs.primary_ &&
replicas_ == rhs.replicas_;
if (start_ != rhs.start_ || end_ != rhs.end_ || *primary_ != *rhs.primary_ ||
replicas_.size() != rhs.replicas_.size()) {
return false;
}
// The value type is shared_ptr, and the shared_ptr is not same one even for same ip:port.
// so, just compare the key here.
return std::equal(replicas_.begin(), replicas_.end(), rhs.replicas_.begin(), rhs.replicas_.end(),
[](const auto& it1, const auto& it2) { return it1.first == it2.first; });
Comment on lines +15 to +16
Copy link
Copy Markdown
Contributor

@snowp snowp Apr 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might have been covered in PR discussions already but how does this differ from just doing replicas_ = rhs.replicas?

Copy link
Copy Markdown
Contributor Author

@gaoliangdut gaoliangdut May 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The value type is shared_ptr, and the shared_ptr is not name one even for same ip:port.

Copy link
Copy Markdown
Contributor

@snowp snowp May 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see this is just comparing the key. Perhaps add a comment to make this clearer?

Copy link
Copy Markdown
Contributor

@snowp snowp May 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ping on this ^^

Would be great to have this covered by a comment

Copy link
Copy Markdown
Contributor Author

@gaoliangdut gaoliangdut May 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I forgot that, now I have add a comment. Thank you!

}

// RedisClusterLoadBalancerFactory
Expand Down Expand Up @@ -43,7 +49,7 @@ bool RedisClusterLoadBalancerFactory::onClusterSlotUpdate(ClusterSlotsPtr&& slot
primary_and_replicas->push_back(primary_host->second);

for (auto const& replica : slot.replicas()) {
auto replica_host = all_hosts.find(replica->asString());
auto replica_host = all_hosts.find(replica.first);
ASSERT(replica_host != all_hosts.end(),
"we expect all address to be found in the updated_hosts");
replicas->push_back(replica_host->second);
Expand Down
9 changes: 4 additions & 5 deletions source/extensions/clusters/redis/redis_cluster_lb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
#include "extensions/filters/network/common/redis/codec.h"
#include "extensions/filters/network/common/redis/supported_commands.h"

#include "absl/container/flat_hash_map.h"
#include "absl/container/flat_hash_set.h"
#include "absl/container/btree_map.h"
#include "absl/synchronization/mutex.h"

namespace Envoy {
Expand All @@ -37,11 +36,11 @@ class ClusterSlot {
int64_t start() const { return start_; }
int64_t end() const { return end_; }
Network::Address::InstanceConstSharedPtr primary() const { return primary_; }
const absl::flat_hash_set<Network::Address::InstanceConstSharedPtr>& replicas() const {
const absl::btree_map<std::string, Network::Address::InstanceConstSharedPtr>& replicas() const {
return replicas_;
}
void addReplica(Network::Address::InstanceConstSharedPtr replica_address) {
replicas_.insert(std::move(replica_address));
replicas_.emplace(replica_address->asString(), std::move(replica_address));
}

bool operator==(const ClusterSlot& rhs) const;
Expand All @@ -50,7 +49,7 @@ class ClusterSlot {
int64_t start_;
int64_t end_;
Network::Address::InstanceConstSharedPtr primary_;
absl::flat_hash_set<Network::Address::InstanceConstSharedPtr> replicas_;
absl::btree_map<std::string, Network::Address::InstanceConstSharedPtr> replicas_;
};

using ClusterSlotsPtr = std::unique_ptr<std::vector<ClusterSlot>>;
Expand Down
20 changes: 17 additions & 3 deletions test/extensions/clusters/redis/redis_cluster_lb_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,18 +349,30 @@ TEST_F(RedisClusterLoadBalancerTest, ClusterSlotUpdate) {

TEST_F(RedisClusterLoadBalancerTest, ClusterSlotNoUpdate) {
Upstream::HostVector hosts{Upstream::makeTestHost(info_, "tcp://127.0.0.1:90", simTime()),
Upstream::makeTestHost(info_, "tcp://127.0.0.1:91", simTime()),
Upstream::makeTestHost(info_, "tcp://127.0.0.1:92", simTime()),
Upstream::makeTestHost(info_, "tcp://127.0.0.1:90", simTime()),
Upstream::makeTestHost(info_, "tcp://127.0.0.1:91", simTime()),
Upstream::makeTestHost(info_, "tcp://127.0.0.1:92", simTime())};
Upstream::HostVector replicas{Upstream::makeTestHost(info_, "tcp://127.0.0.2:90", simTime()),
Upstream::makeTestHost(info_, "tcp://127.0.0.2:91", simTime()),
Upstream::makeTestHost(info_, "tcp://127.0.0.2:90", simTime()),
Upstream::makeTestHost(info_, "tcp://127.0.0.2:91", simTime())};

ClusterSlotsPtr slots = std::make_unique<std::vector<ClusterSlot>>(std::vector<ClusterSlot>{
ClusterSlot(0, 1000, hosts[0]->address()),
ClusterSlot(1001, 2000, hosts[1]->address()),
ClusterSlot(2001, 16383, hosts[2]->address()),
});

(*slots)[0].addReplica(replicas[0]->address());
(*slots)[0].addReplica(replicas[1]->address());
Upstream::HostMap all_hosts{
{hosts[0]->address()->asString(), hosts[0]},
{hosts[1]->address()->asString(), hosts[1]},
{hosts[2]->address()->asString(), hosts[2]},
{replicas[0]->address()->asString(), replicas[0]},
{replicas[1]->address()->asString(), replicas[1]},
};

// A list of (hash: host_index) pair.
Expand All @@ -373,10 +385,12 @@ TEST_F(RedisClusterLoadBalancerTest, ClusterSlotNoUpdate) {

// Calling cluster slot update without change should not change assignment.
std::vector<ClusterSlot> updated_slot{
ClusterSlot(0, 1000, hosts[0]->address()),
ClusterSlot(1001, 2000, hosts[1]->address()),
ClusterSlot(2001, 16383, hosts[2]->address()),
ClusterSlot(0, 1000, hosts[3]->address()),
ClusterSlot(1001, 2000, hosts[4]->address()),
ClusterSlot(2001, 16383, hosts[5]->address()),
};
updated_slot[0].addReplica(replicas[3]->address());
updated_slot[0].addReplica(replicas[2]->address());
EXPECT_EQ(false, factory_->onClusterSlotUpdate(
std::make_unique<std::vector<ClusterSlot>>(updated_slot), all_hosts));
validateAssignment(hosts, expected_assignments);
Expand Down