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 1 commit
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
14 changes: 12 additions & 2 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,18 @@ 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;
} else {
for (auto it1 = replicas_.begin(), it2 = rhs.replicas_.begin(); it1 != replicas_.end();
it1++, it2++) {
if (**it1 != **it2) {
return false;
}
}

@rojkov rojkov Apr 22, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nit: this loop shouldn't be nested in else to lessen cognitive load.

@gaoliangdut gaoliangdut Apr 23, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thank you for your suggestion, I have add a new commit.

return true;
}
}

// RedisClusterLoadBalancerFactory
Expand Down
9 changes: 6 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,6 +349,9 @@ 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())};

Expand All @@ -373,9 +376,9 @@ 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()),
};
EXPECT_EQ(false, factory_->onClusterSlotUpdate(
std::make_unique<std::vector<ClusterSlot>>(updated_slot), all_hosts));
Expand Down