Skip to content

testing: Add some more debug scaffolding around the hotrestart_test#2604

Merged
htuch merged 8 commits intoenvoyproxy:masterfrom
jmarantz:hotrestart-test-debug
Feb 18, 2018
Merged

testing: Add some more debug scaffolding around the hotrestart_test#2604
htuch merged 8 commits intoenvoyproxy:masterfrom
jmarantz:hotrestart-test-debug

Conversation

@jmarantz
Copy link
Contributor

@jmarantz jmarantz commented Feb 14, 2018

Description:
hotrestart_test is difficult to debug when it goes wrong, because there are many different sub-tests within it, and it's hard to track where a failure occurs. This borrows some sh-test debug scaffolding from PageSpeed where it's proved useful.

Risk Level: Low

Testing:
//test/integration:hotrestart_test
//test/integration:hotrestart_test --runs_per_test=10 --jobs=1
//test/integration:hotrestart_test --config=tsan --runs_per_test=10 --jobs=1

Release Notes: N/A

This can be factored out into a test helper library if it seems more
broadly useful (which it was intended to be).

Signed-off-by: Joshua Marantz <jmarantz@google.com>
Signed-off-by: Joshua Marantz <jmarantz@google.com>
Signed-off-by: Joshua Marantz <jmarantz@google.com>
Signed-off-by: Joshua Marantz <jmarantz@google.com>
Copy link
Member

@ggreenway ggreenway left a comment

Choose a reason for hiding this comment

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

This is a really nice cleanup of this test! A few comments, but I really like it overall.


CURRENT_TEST="NONE"
function start_test() {
#update_elapsed_time
Copy link
Member

Choose a reason for hiding this comment

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

Delete commented-out stuff?

--admin-address-path "${ADMIN_ADDRESS_PATH_0}"

FIRST_SERVER_PID=$!
sleep 3
Copy link
Member

Choose a reason for hiding this comment

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

Without some time here (not that I love arbitrary sleep in test...), couldn't we send signals to the process before it has installed signal handlers?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good catch; done.

@ggreenway ggreenway self-assigned this Feb 14, 2018

CURRENT_TEST="NONE"
function start_test() {
#update_elapsed_time
Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Signed-off-by: Joshua Marantz <jmarantz@google.com>
ggreenway
ggreenway previously approved these changes Feb 14, 2018
@ggreenway
Copy link
Member

Need to resolve merge conflicts

Signed-off-by: Joshua Marantz <jmarantz@google.com>
local src="${BASH_SOURCE[$i]}"
[ -z "$src" ] && src=non_file_source
local canonical_dir=$(cd $(dirname "$src") && pwd)
local short_dir=${canonical_dir#*/net/instaweb/}
Copy link
Member

Choose a reason for hiding this comment

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

LGTM if you can cleanup this stuff.

Signed-off-by: Joshua Marantz <jmarantz@google.com>
@ggreenway
Copy link
Member

More merge conflicts

Signed-off-by: Joshua Marantz <jmarantz@google.com>
@dnoe
Copy link
Contributor

dnoe commented Feb 16, 2018

@htuch for final review pass

Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

Thanks!

@htuch htuch merged commit 5776e57 into envoyproxy:master Feb 18, 2018
Shikugawa pushed a commit to Shikugawa/envoy that referenced this pull request Mar 28, 2020
* add configurable metric export interval

* format

* update env variable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants