Skip to content
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b4bb682
Save progress
zasweq Oct 1, 2020
8df52a8
Save progress
zasweq Oct 2, 2020
7ee7b14
Save progress, can almost build
zasweq Oct 2, 2020
9e8d678
Almost builds
zasweq Oct 2, 2020
b977914
Merge branch 'master' into load-balancer-fuzz
zasweq Oct 2, 2020
1cfaa5d
Builds correctly
zasweq Oct 2, 2020
73c24ed
Got rid of unused imports
zasweq Oct 2, 2020
54d5b67
Save progress
zasweq Oct 5, 2020
d5f072f
Ready for PR, working with Asan-fuzzer
zasweq Oct 6, 2020
8c00f14
Got rid of logs
zasweq Oct 6, 2020
810eb49
Spelling
zasweq Oct 6, 2020
413214c
First round of comments, saving progress
zasweq Oct 6, 2020
b5619fe
Responded to comments and redesigned based on design discussion
zasweq Oct 6, 2020
c4a53c0
Clean up
zasweq Oct 6, 2020
6bcb394
Responded to Asra's comments
zasweq Oct 7, 2020
ea0264a
Save progress, responded to Alex's comments and some Harvey comments
zasweq Oct 8, 2020
e43bb2c
Responded to Harvey's comments
zasweq Oct 9, 2020
6e3c420
Style
zasweq Oct 9, 2020
a7d7e88
Responded to Harvey's comments
zasweq Oct 9, 2020
5c6bdaf
Spelling CI
zasweq Oct 9, 2020
92666c1
Changed update to use generated bytes, added util class
zasweq Oct 9, 2020
6ee35db
Responded to Asra's comments
zasweq Oct 12, 2020
a81eabe
Added logic for localities
zasweq Oct 13, 2020
31a5668
Fixed slow iterations
zasweq Oct 13, 2020
91e5738
Partially responded to comments
zasweq Oct 13, 2020
794918b
Clang Tidy
zasweq Oct 13, 2020
c1c8e29
Adi's refactor comment
zasweq Oct 13, 2020
741b3a0
Clang tidy and Harvey nit
zasweq Oct 14, 2020
52cbbd5
Responded to Asra's comments
zasweq Oct 14, 2020
4bec47d
Partially responded to comments, still have 0(N^2) and flags
zasweq Oct 15, 2020
11a7f74
Removed O(N^2) and added health flags
zasweq Oct 15, 2020
4675237
Responded to Asra's comments
zasweq Oct 16, 2020
d07db49
Spelling
zasweq Oct 16, 2020
ff8e22f
Responded to Harvey's comments
zasweq Oct 19, 2020
d71c5d1
Responded to comments
zasweq Oct 20, 2020
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
48 changes: 48 additions & 0 deletions test/common/upstream/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,54 @@ envoy_cc_test(
],
)

envoy_cc_test_library(
name = "load_balancer_fuzz_lib",
srcs = ["load_balancer_fuzz_base.cc"],
hdrs = ["load_balancer_fuzz_base.h"],
deps = [
":load_balancer_fuzz_proto_cc_proto",
":utility_lib",
"//source/common/upstream:load_balancer_lib",
"//test/fuzz:random_lib",
"//test/mocks:common_lib",
"//test/mocks/runtime:runtime_mocks",
"//test/mocks/upstream:cluster_info_mocks",
"//test/mocks/upstream:host_set_mocks",
"//test/mocks/upstream:load_balancer_context_mock",
"//test/mocks/upstream:priority_set_mocks",
"@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
],
)

envoy_proto_library(
name = "load_balancer_fuzz_proto",
srcs = ["load_balancer_fuzz.proto"],
deps = [
"//test/fuzz:common_proto",
"@envoy_api//envoy/config/cluster/v3:pkg",
],
)

envoy_proto_library(
name = "random_load_balancer_fuzz_proto",
srcs = ["random_load_balancer_fuzz.proto"],
deps = [
"//test/common/upstream:load_balancer_fuzz_proto",
],
)

envoy_cc_fuzz_test(
name = "random_load_balancer_fuzz_test",
srcs = ["random_load_balancer_fuzz_test.cc"],
corpus = "//test/common/upstream:random_load_balancer_corpus",
deps = [
":load_balancer_fuzz_lib",
":load_balancer_fuzz_proto_cc_proto",
":random_load_balancer_fuzz_proto_cc_proto",
":utility_lib",
],
)

envoy_cc_test(
name = "load_balancer_simulation_test",
srcs = ["load_balancer_simulation_test.cc"],
Expand Down
44 changes: 44 additions & 0 deletions test/common/upstream/load_balancer_fuzz.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
syntax = "proto3";

package test.common.upstream;

import "validate/validate.proto";
import "envoy/config/cluster/v3/cluster.proto";
import "google/protobuf/empty.proto";

message UpdateHealthFlags {
// The host index determines what host set within the priority set which will get updated.
uint64 host_index = 1;
Comment thread
zasweq marked this conversation as resolved.
Outdated
// These will determine how many hosts will get placed into health hosts, degraded hosts, and
// excluded hosts from the full host list.
uint32 num_healthy_hosts = 2;
Comment thread
zasweq marked this conversation as resolved.
uint32 num_degraded_hosts = 3;
uint32 num_excluded_hosts = 4;
// This is used to determine which hosts get marked as healthy, degraded, and excluded.
bytes random_bytestring = 5 [(validate.rules).bytes = {min_len: 1, max_len: 256}];

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.

FWIW, an idea of making this run-length encoded just occurred to me, it would be space efficient, but not sure how that would interact with the fuzzing cross-over.

}

message LbAction {
oneof action_selector {
option (validate.required) = true;
UpdateHealthFlags update_health_flags = 1;
google.protobuf.Empty prefetch = 2;
Comment thread
zasweq marked this conversation as resolved.
google.protobuf.Empty choose_host = 3;
}
}

// This message represents what LoadBalancerFuzzBase will interact with, performing setup of host sets and calling into load balancers.
// The logic that this message represents and the base class for load balancing fuzzing will be logic that maps to all types of load balancing
// and can be used in a modular way at the highest level for each load balancer.
message LoadBalancerTestCase {
envoy.config.cluster.v3.Cluster.CommonLbConfig common_lb_config = 1
[(validate.rules).message.required = true];
repeated LbAction actions = 2;

// TODO: Localities
repeated uint32 num_hosts_in_host_set = 3
[(validate.rules).repeated = {min_items: 1, max_items: 20}];
Comment thread
zasweq marked this conversation as resolved.

// This number is used to instantiate the prng. The prng takes the place of random() calls, allowing a representative random distribution which is also deterministic.
uint64 seed_for_prng = 4 [(validate.rules).uint64.gt = 0];
}
118 changes: 118 additions & 0 deletions test/common/upstream/load_balancer_fuzz_base.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
#include "test/common/upstream/load_balancer_fuzz_base.h"

#include "test/common/upstream/utility.h"

namespace Envoy {
namespace Upstream {

void LoadBalancerFuzzBase::initializeASingleHostSet(uint32_t num_hosts_in_host_set,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's a TODO to initialize healthy/degraded hosts too and split into localities, right? feel free to resolve if so

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.

Yeah, but I don't think we should initialize explicit healthy/degraded hosts. That functionality is taken care of by updateHealthFlagsForHostSet. Moving all that logic up here would clutter things up. Yes, splitting into localities is what I'm working on today.

uint8_t index_of_host_set) {
Comment thread
zasweq marked this conversation as resolved.
Outdated
ENVOY_LOG_MISC(trace, "Will attempt to initialize host set {} with {} hosts.", index_of_host_set,
num_hosts_in_host_set);
MockHostSet& host_set = *priority_set_.getMockHostSet(index_of_host_set);
uint32_t hosts_made = 0;
// Cap each host set at 256 hosts for efficiency
Comment thread
zasweq marked this conversation as resolved.
Outdated
uint32_t max_num_hosts_in_host_set = 256;
Comment thread
zasweq marked this conversation as resolved.
Outdated
// Leave port clause in for future changes
while (hosts_made < std::min(num_hosts_in_host_set, max_num_hosts_in_host_set) && port_ < 65535) {
host_set.hosts_.push_back(makeTestHost(info_, "tcp://127.0.0.1:" + std::to_string(port_)));
++port_;
++hosts_made;
Comment thread
asraa marked this conversation as resolved.
}
// TODO: Random call and mod against host_set size for locality logic
}

// Initializes random and fixed host sets
void LoadBalancerFuzzBase::initializeLbComponents(
const test::common::upstream::LoadBalancerTestCase& input) {
random_.initializeSeed(input.seed_for_prng());
uint8_t index_of_host_set = 0;
for (uint16_t num_hosts_in_host_set : input.num_hosts_in_host_set()) {
initializeASingleHostSet(num_hosts_in_host_set, index_of_host_set);
index_of_host_set++;
}
num_host_sets_ = index_of_host_set;
Comment thread
zasweq marked this conversation as resolved.
Outdated
}

// Updating host sets is shared amongst all the load balancer tests. Since logically, we're just
// setting the mock priority set to have certain values, and all load balancers interface with host
// sets and their health statuses, this action maps to all load balancers.
void LoadBalancerFuzzBase::updateHealthFlagsForAHostSet(uint64_t host_index,
Comment thread
zasweq marked this conversation as resolved.
Outdated
uint32_t num_healthy_hosts,
uint32_t num_degraded_hosts,
uint32_t num_excluded_hosts,
std::string random_bytestring) {
uint8_t index_of_host_set = host_index % num_host_sets_;
Comment thread
zasweq marked this conversation as resolved.
Outdated
ENVOY_LOG_MISC(trace, "Updating health flags for host set: {}", index_of_host_set);
MockHostSet& host_set = *priority_set_.getMockHostSet(index_of_host_set);
// This downcast will not overflow because size is capped by port numbers
Comment thread
zasweq marked this conversation as resolved.
uint32_t host_set_size = host_set.hosts_.size();
host_set.healthy_hosts_.clear();
host_set.degraded_hosts_.clear();
host_set.excluded_hosts_.clear();

Fuzz::ProperSubsetSelector subset_selector(random_bytestring);

std::vector<std::vector<uint8_t>> subsets = subset_selector.constructSubsets(
3, {num_healthy_hosts, num_degraded_hosts, num_excluded_hosts}, host_set_size);

// Healthy hosts are first subset
for (uint8_t index : subsets.at(0)) {
Comment thread
zasweq marked this conversation as resolved.
Outdated
host_set.healthy_hosts_.push_back(host_set.hosts_[index]);
ENVOY_LOG_MISC(trace, "Index of host made healthy: {}", index);
Comment thread
asraa marked this conversation as resolved.
Outdated
}

// Degraded hosts are second subset
for (uint8_t index : subsets.at(1)) {
host_set.degraded_hosts_.push_back(host_set.hosts_[index]);
Comment thread
zasweq marked this conversation as resolved.
ENVOY_LOG_MISC(trace, "Index of host made degraded: {}", index);
}

// Excluded hosts are third subset
for (uint8_t index : subsets.at(1)) {
Comment thread
zasweq marked this conversation as resolved.
Outdated
host_set.excluded_hosts_.push_back(host_set.hosts_[index]);
ENVOY_LOG_MISC(trace, "Index of host made excluded: {}", index);
}

host_set.runCallbacks({}, {});
Comment thread
zasweq marked this conversation as resolved.
Comment thread
zasweq marked this conversation as resolved.
}

void LoadBalancerFuzzBase::prefetch() {
// TODO: context, could generate it in proto action
lb_->peekAnotherHost(nullptr);
}

void LoadBalancerFuzzBase::chooseHost() {
// TODO: context, could generate it in proto action
lb_->chooseHost(nullptr);
}

void LoadBalancerFuzzBase::replay(
const Protobuf::RepeatedPtrField<test::common::upstream::LbAction>& actions) {
constexpr auto max_actions = 64;
for (int i = 0; i < std::min(max_actions, actions.size()); ++i) {
const auto& event = actions.at(i);
ENVOY_LOG_MISC(trace, "Action: {}", event.DebugString());
switch (event.action_selector_case()) {
case test::common::upstream::LbAction::kUpdateHealthFlags: {
updateHealthFlagsForAHostSet(event.update_health_flags().host_index(),
event.update_health_flags().num_healthy_hosts(),
event.update_health_flags().num_degraded_hosts(),
event.update_health_flags().num_excluded_hosts(),
event.update_health_flags().random_bytestring());
break;
}
case test::common::upstream::LbAction::kPrefetch:
prefetch();
break;
case test::common::upstream::LbAction::kChooseHost:
chooseHost();
break;
default:
break;
}
}
}

} // namespace Upstream
} // namespace Envoy
58 changes: 58 additions & 0 deletions test/common/upstream/load_balancer_fuzz_base.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#include "envoy/config/cluster/v3/cluster.pb.h"

#include "common/upstream/load_balancer_impl.h"

#include "test/common/upstream/load_balancer_fuzz.pb.validate.h"
#include "test/fuzz/random.h"
#include "test/mocks/common.h"
#include "test/mocks/runtime/mocks.h"
#include "test/mocks/upstream/cluster_info.h"
#include "test/mocks/upstream/host_set.h"
#include "test/mocks/upstream/load_balancer_context.h"
#include "test/mocks/upstream/priority_set.h"

namespace Envoy {
namespace Upstream {

// This class implements replay logic, and also handles the initial setup of static host sets and
// the subsequent updates to those sets.
class LoadBalancerFuzzBase {
public:
LoadBalancerFuzzBase() : stats_(ClusterInfoImpl::generateStats(stats_store_)){};

// Untrusted upstreams don't have the ability to change the host set size, so keep it constant
// over the fuzz iteration.
void initializeASingleHostSet(uint32_t num_hosts_in_host_set, uint8_t index_of_host_set);

// Initializes load balancer components shared amongst every load balancer, random_, and
// priority_set_
void initializeLbComponents(const test::common::upstream::LoadBalancerTestCase& input);
void updateHealthFlagsForAHostSet(uint64_t host_index, uint32_t num_healthy_hosts,
uint32_t num_degraded_hosts, uint32_t num_excluded_hosts,
std::string random_bytestring);
// These two actions have a lot of logic attached to them. However, all the logic that the load
// balancer needs to run its algorithm is already encapsulated within the load balancer. Thus,
// once the load balancer is constructed, all this class has to do is call lb_->peekAnotherHost()
// and lb_->chooseHost().
void prefetch();
void chooseHost();
~LoadBalancerFuzzBase() = default;
void replay(const Protobuf::RepeatedPtrField<test::common::upstream::LbAction>& actions);

// These public objects shared amongst all types of load balancers will be used to construct load
// balancers in specific load balancer fuzz classes
Stats::IsolatedStoreImpl stats_store_;
ClusterStats stats_;
NiceMock<Runtime::MockLoader> runtime_;
Random::PsuedoRandomGenerator64 random_;
NiceMock<MockPrioritySet> priority_set_;
std::shared_ptr<MockClusterInfo> info_{new NiceMock<MockClusterInfo>()};
std::unique_ptr<LoadBalancerBase> lb_;
Comment thread
htuch marked this conversation as resolved.

// There are used to construct the priority set at the beginning of the fuzz iteration
uint16_t port_ = 80;
Comment thread
zasweq marked this conversation as resolved.
Outdated
uint8_t num_host_sets_ = 0;
};

} // namespace Upstream
} // namespace Envoy
35 changes: 35 additions & 0 deletions test/common/upstream/random_load_balancer_corpus/random_256_ports

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions test/common/upstream/random_load_balancer_corpus/random_NoHosts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions test/common/upstream/random_load_balancer_corpus/random_Normal

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading