Skip to content

http timeout integration test: wait for 10ms for upstream reset#6646

Merged
mattklein123 merged 2 commits intoenvoyproxy:masterfrom
mpuncel:mpuncel/fix-integration-test-flake
Apr 19, 2019
Merged

http timeout integration test: wait for 10ms for upstream reset#6646
mattklein123 merged 2 commits intoenvoyproxy:masterfrom
mpuncel:mpuncel/fix-integration-test-flake

Conversation

@mpuncel
Copy link
Copy Markdown
Contributor

@mpuncel mpuncel commented Apr 18, 2019

This test waits for the upstream to see a reset which confirms that the
router filter did the right thing when the global timeout is hit.
However since this involves the network, we would occasionally see the
reset after the wait call. Since we were waiting for 0ms we'd get
flakes. 10ms is hopefully high enough that the test will succeed
reliably.

Signed-off-by: Michael Puncel mpuncel@squareup.com

Description: address an integration test flake by sleeping longer when waiting for a remote reset to occur.
Risk Level: low
Testing: integration test
Docs Changes: n/a
Release Notes: n/a
Fixes #6638
[Optional Deprecated:]

This test waits for the upstream to see a reset which confirms that the
router filter did the right thing when the global timeout is hit.
However since this involves the network, we would occasionally see the
reset after the wait call. Since we were waiting for 0ms we'd get
flakes. 10ms is hopefully high enough that the test will succeed
reliably.

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
@mpuncel
Copy link
Copy Markdown
Contributor Author

mpuncel commented Apr 18, 2019

I'm not able to reproduce the flake locally after this change

Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Thanks for the fix. One comment. cc @jmarantz for a more holistic view of this in terms of simulated time when he comes back.

/wait

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
@mpuncel
Copy link
Copy Markdown
Contributor Author

mpuncel commented Apr 19, 2019

/retest

@repokitteh-read-only
Copy link
Copy Markdown

🔨 rebuilding ci/circleci: coverage (failed build)

🐱

Caused by: a #6646 (comment) was created by @mpuncel.

see: more, trace.

Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Thank you!

@mattklein123 mattklein123 merged commit 4e01b0b into envoyproxy:master Apr 19, 2019
mpuncel added a commit to mpuncel/envoy that referenced this pull request Apr 19, 2019
* master: (26 commits)
  docs: update docs to recommend /retest repokitteh command (envoyproxy#6655)
  http timeout integration test: wait for 15s for upstream reset (envoyproxy#6646)
  access log: add response code details to the access log formatter (envoyproxy#6626)
  build: add ppc build badge to README (envoyproxy#6629)
  Revert dispatcher stats (envoyproxy#6649)
  Batch implementation with timer (envoyproxy#6452)
  fault filter: reset token bucket on data start (envoyproxy#6627)
  event: update libevent dependency to fix race condition (envoyproxy#6637)
  examples: standardize docker-compose version and yaml extension (envoyproxy#6613)
  quiche: Implement SpdyUnsafeArena using SpdySimpleArena (envoyproxy#6612)
  router: support customizable retry back-off intervals (envoyproxy#6568)
  api: create OpenRCA service proto file (envoyproxy#6497)
  ext_authz: option for clearing route cache of authorized requests (envoyproxy#6503)
  build: update jinja to 2.10.1. (envoyproxy#6623)
  tools: check spelling in pre-push hook (envoyproxy#6631)
  security: blameless postmortem template. (envoyproxy#6553)
  Implementing Endpoint lease for ClusterLoadAssigment (envoyproxy#6477)
  add HTTP integration tests exercising timeouts (envoyproxy#6621)
  event: fix DispatcherImplTest::InitializeStats flake (envoyproxy#6619)
  Add tag extractor for RDS route config name (envoyproxy#6618)
  ...

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
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.

http_timeout_integration_test flake

2 participants