Skip to content

test: fix flake in ads_integration_test #7091

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
mattklein123 merged 2 commits into from
May 29, 2019
Merged

test: fix flake in ads_integration_test #7091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b41652a
fix flake in ads_integration_test
fredlas May 28, 2019
f8280a6
Merge remote-tracking branch 'upstream/master' into FLK_flake
fredlas May 28, 2019
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
39 changes: 21 additions & 18 deletions test/integration/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,24 +169,26 @@ void IntegrationTestServerImpl::createAndRunEnvoyServer(
Network::Address::InstanceConstSharedPtr local_address, ListenerHooks& hooks,
Thread::BasicLockable& access_log_lock, Server::ComponentFactory& component_factory,
Runtime::RandomGeneratorPtr&& random_generator) {
Stats::FakeSymbolTableImpl symbol_table;
Server::HotRestartNopImpl restarter;
ThreadLocal::InstanceImpl tls;
Stats::HeapStatDataAllocator stats_allocator(symbol_table);
Stats::ThreadLocalStoreImpl stat_store(stats_allocator);

Server::InstanceImpl server(options, time_system, local_address, hooks, restarter, stat_store,
access_log_lock, component_factory, std::move(random_generator), tls,
Thread::threadFactoryForTest(), Filesystem::fileSystemForTest(),
nullptr);
// This is technically thread unsafe (assigning to a shared_ptr accessed
// across threads), but because we synchronize below through serverReady(), the only
// consumer on the main test thread in ~IntegrationTestServerImpl will not race.
admin_address_ = server.admin().socket().localAddress();
server_ = &server;
stat_store_ = &stat_store;
serverReady();
server.run();
{
Stats::FakeSymbolTableImpl symbol_table;
Server::HotRestartNopImpl restarter;
ThreadLocal::InstanceImpl tls;
Stats::HeapStatDataAllocator stats_allocator(symbol_table);
Stats::ThreadLocalStoreImpl stat_store(stats_allocator);
Server::InstanceImpl server(options, time_system, local_address, hooks, restarter, stat_store,
access_log_lock, component_factory, std::move(random_generator),
tls, Thread::threadFactoryForTest(),
Filesystem::fileSystemForTest(), nullptr);
// This is technically thread unsafe (assigning to a shared_ptr accessed
// across threads), but because we synchronize below through serverReady(), the only
// consumer on the main test thread in ~IntegrationTestServerImpl will not race.
admin_address_ = server.admin().socket().localAddress();
server_ = &server;
stat_store_ = &stat_store;
serverReady();
server.run();
}
server_gone_.Notify();
}

IntegrationTestServerImpl::~IntegrationTestServerImpl() {
Expand All @@ -202,6 +204,7 @@ IntegrationTestServerImpl::~IntegrationTestServerImpl() {
admin_address, "POST", "/quitquitquit", "", Http::CodecClient::Type::HTTP1);
EXPECT_TRUE(response->complete());
EXPECT_EQ("200", response->headers().Status()->value().getStringView());
server_gone_.WaitForNotification();
}
}

Expand Down
3 changes: 3 additions & 0 deletions test/integration/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "test/test_common/test_time_system.h"
#include "test/test_common/utility.h"

#include "absl/synchronization/notification.h"

namespace Envoy {
namespace Server {

Expand Down Expand Up @@ -380,6 +382,7 @@ class IntegrationTestServerImpl : public IntegrationTestServer {
Server::Instance* server_{};
Stats::Store* stat_store_{};
Network::Address::InstanceConstSharedPtr admin_address_;
absl::Notification server_gone_;
};

} // namespace Envoy