wasm: Force stop iteration after local response is sent #13930

mathetake · 2020-11-07T06:43:39Z

Signed-off-by: mathetake takeshi@tetrate.io

resolves #13857

ref:
-proxy-wasm/proxy-wasm-rust-sdk#44
-proxy-wasm/proxy-wasm-cpp-host#88
-proxy-wasm/proxy-wasm-cpp-host#93

Signed-off-by: mathetake <takeshi@tetrate.io>

repokitteh-read-only · 2020-11-07T06:43:45Z

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).

🐱

Caused by: #13930 was opened by mathetake.

see: more, trace.

PiotrSikora

LGTM once the repository updated to point to the merged commit.

Signed-off-by: mathetake <takeshi@tetrate.io>

PiotrSikora

Something is broken.

/wait

Signed-off-by: mathetake <takeshi@tetrate.io>

bazel/repository_locations.bzl

Signed-off-by: mathetake <takeshi@tetrate.io>

antoniovicente · 2020-11-10T16:00:02Z

test/extensions/filters/http/wasm/wasm_filter_test.cc

@@ -1436,7 +1436,8 @@ TEST_P(WasmHttpFilterTest, RootId2) {
  setupFilter("context2");
  EXPECT_CALL(filter(), log_(spdlog::level::debug, Eq(absl::string_view("onRequestHeaders2 2"))));
  Http::TestRequestHeaderMapImpl request_headers;
-  EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter().decodeHeaders(request_headers, true));
+  EXPECT_EQ(Http::FilterHeadersStatus::StopAllIterationAndWatermark,
+            filter().decodeHeaders(request_headers, true));


Given that the filter code is in a different repo, does it make sense to have assertions like this one about the return values of decodeHeaders in the main repo? It doesn't seem right to me. This PR can go in anyway, but we should rethink how this works going forward.

The test filter is in this repo, this is the test case for which the behavior changed:

envoy/test/extensions/filters/http/wasm/test_data/test_cpp.cc

Lines 750 to 754 in 1d6d68b

FilterHeadersStatus Context2::onRequestHeaders(uint32_t, bool) {

logDebug(std::string("onRequestHeaders2 ") + std::to_string(id()));

CHECK_RESULT(sendLocalResponse(200, "ok", "body", {{"foo", "bar"}}));

return FilterHeadersStatus::Continue;

}

So the coding error was in a wasm filter implementation, not in the wasm framework itself?

Yes, this protects against coding errors in user-supplied Wasm filters (i.e. FilterHeadersStatus::Continue returned after sendLocalResponse() above).

…3930) Resolves envoyproxy#13857 ref: -proxy-wasm/proxy-wasm-rust-sdk#44 -proxy-wasm/proxy-wasm-cpp-host#88 -proxy-wasm/proxy-wasm-cpp-host#93 Signed-off-by: mathetake <takeshi@tetrate.io> Signed-off-by: Piotr Sikora <piotrsikora@google.com>

@PiotrSikora

* build: update rules_rust to allow Rustc in RBE (envoyproxy#13595) Signed-off-by: Lizan Zhou <lizan@tetrate.io> Signed-off-by: Piotr Sikora <piotrsikora@google.com> * fix macos v8 build (envoyproxy#13572) Signed-off-by: Rama Chavali <rama.rao@salesforce.com> * wasm: update proxy-wasm-cpp-host (envoyproxy#13606) The PR updates proxy-wasm-cpp-host dependency for enhancing the capability and fixing a bug in WASM extensions. The change consists of three PRs in proxy-wasm-cpp-host: 1. proxy-wasm/proxy-wasm-cpp-host#68 @PiotrSikora 2. proxy-wasm/proxy-wasm-cpp-host#65 @mathetake (me) 3. proxy-wasm/proxy-wasm-cpp-host#64 @mathetake (me) The code change can be found at proxy-wasm/proxy-wasm-cpp-host@49ed20e...c5658d3 . 1 & 2 enhance WASM capability, and 3 fixes a bug in situations where users share vm_id for multiple filters. For details, please take a look at these original PRs. Signed-off-by: mathetake <takeshi@tetrate.io> Signed-off-by: Piotr Sikora <piotrsikora@google.com> * wasm: re-enable tests with precompiled modules. (envoyproxy#13583) Fixes envoyproxy#12335. Signed-off-by: Piotr Sikora <piotrsikora@google.com> * wasm: flip the meaning of the "repository" in envoy_wasm_cc_binary(). (envoyproxy#13621) Change the meaning of the "repository" parameter to refer to an external Bazel repository, instead of using "@envoy" in targets that are included in the Envoy repository. This aligns with other envoy_* rules. Signed-off-by: Piotr Sikora <piotrsikora@google.com> * build: support ppc64le with wasm (envoyproxy#13657) The build has only been tested with gn git sha 5da62d5 as recommended by ppc64 maintainers of the v8 runtime. Signed-off-by: Christopher M. Luciano <cmluciano@us.ibm.com> * wasm: remove no longer needed Emscripten metadata. (envoyproxy#13667) Signed-off-by: Piotr Sikora <piotrsikora@google.com> * fix wasm compilation (envoyproxy#13765) Signed-off-by: Asra Ali <asraa@google.com> * wasm: strip only Custom Sections with precompiled Wasm modules. (envoyproxy#13775) Signed-off-by: Piotr Sikora <piotrsikora@google.com> * build: don't build shared libraries for zlib and zlib-ng. (envoyproxy#13652) Signed-off-by: Piotr Sikora <piotrsikora@google.com> * wasm: update V8 to v8.7.220.10. (envoyproxy#13568) Signed-off-by: Piotr Sikora <piotrsikora@google.com> * build: exclude wee8/out from inputs (envoyproxy#13866) If you build without sandboxing for performance, the output files from this custom build genrule contained timestamps which caused it to rebuild every single build. Signed-off-by: Keith Smiley <keithbsmiley@gmail.com> * tls: fix detection of the upstream connection close event. (envoyproxy#13858) Fixes envoyproxy#13856. Signed-off-by: Piotr Sikora <piotrsikora@google.com> * wasm: Force stop iteration after local response is sent (envoyproxy#13930) Resolves envoyproxy#13857 ref: -proxy-wasm/proxy-wasm-rust-sdk#44 -proxy-wasm/proxy-wasm-cpp-host#88 -proxy-wasm/proxy-wasm-cpp-host#93 Signed-off-by: mathetake <takeshi@tetrate.io> Signed-off-by: Piotr Sikora <piotrsikora@google.com> * wasm: fix order of callbacks for paused requests. (envoyproxy#13840) Fixes proxy-wasm/proxy-wasm-rust-sdk#43. Signed-off-by: Piotr Sikora <piotrsikora@google.com> * wasm: fix network leak (envoyproxy#13836) Signed-off-by: Kuat Yessenov <kuat@google.com> Co-authored-by: Lizan Zhou <lizan@tetrate.io> Co-authored-by: Rama Chavali <rama.rao@salesforce.com> Co-authored-by: Takeshi Yoneda <yoneda.takeshi.md@alumni.tsukuba.ac.jp> Co-authored-by: cmluciano <cmluciano@us.ibm.com> Co-authored-by: asraa <asraa@google.com> Co-authored-by: Keith Smiley <keithbsmiley@gmail.com> Co-authored-by: Takeshi Yoneda <takeshi@tetrate.io> Co-authored-by: Kuat <kyessenov@users.noreply.github.com>

wasm: stop iteration when local reply sent

bd4423c

Signed-off-by: mathetake <takeshi@tetrate.io>

repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Nov 7, 2020

mathetake mentioned this pull request Nov 7, 2020

Force stop iteration after local response is sent proxy-wasm/proxy-wasm-cpp-host#88

Merged

antoniovicente added the waiting label Nov 9, 2020

PiotrSikora previously approved these changes Nov 9, 2020

View reviewed changes

update proxy-wasm-cpph-host repo location

4ed88b7

Signed-off-by: mathetake <takeshi@tetrate.io>

mathetake dismissed PiotrSikora’s stale review via 4ed88b7 November 9, 2020 23:26

repokitteh-read-only bot removed the waiting label Nov 9, 2020

mathetake marked this pull request as ready for review November 9, 2020 23:26

mathetake requested a review from lizan as a code owner November 9, 2020 23:26

mathetake requested a review from PiotrSikora November 9, 2020 23:27

PiotrSikora approved these changes Nov 9, 2020

View reviewed changes

mathetake changed the title ~~wasm: stop iteration when local reply sent~~ wasm: Force stop iteration after local response is sent Nov 9, 2020

PiotrSikora suggested changes Nov 10, 2020

View reviewed changes

repokitteh-read-only bot added the waiting label Nov 10, 2020

Update proxy-wasm-cpp-host

2de4fba

Signed-off-by: mathetake <takeshi@tetrate.io>

repokitteh-read-only bot removed the waiting label Nov 10, 2020

mathetake added 3 commits November 10, 2020 13:55

Update proxy-wasm-cpp-host

7f8eb32

Signed-off-by: mathetake <takeshi@tetrate.io>

Update proxy-wasm-cpp-host

300440f

Signed-off-by: mathetake <takeshi@tetrate.io>

Update proxy-wasm-cpp-host: point to origin

c4f64e1

Signed-off-by: mathetake <takeshi@tetrate.io>

PiotrSikora previously approved these changes Nov 10, 2020

View reviewed changes

PiotrSikora reviewed Nov 10, 2020

View reviewed changes

bazel/repository_locations.bzl Show resolved Hide resolved

Update release date of proxy-wasm-cpp-host

9977516

Signed-off-by: mathetake <takeshi@tetrate.io>

mathetake dismissed PiotrSikora’s stale review via 9977516 November 10, 2020 09:20

PiotrSikora approved these changes Nov 10, 2020

View reviewed changes

PiotrSikora mentioned this pull request Nov 10, 2020

wasm: allow execution of multiple instances of the same plugin. #13753

Merged

mathetake mentioned this pull request Nov 10, 2020

wasm: Add Wasmtime as a new runtime #13932

Merged

antoniovicente reviewed Nov 10, 2020

View reviewed changes

mathetake requested a review from PiotrSikora November 11, 2020 07:25

lizan approved these changes Nov 11, 2020

View reviewed changes

lizan merged commit d525ae7 into envoyproxy:master Nov 11, 2020

mathetake deleted the wasm-local-reply-stop branch November 11, 2020 07:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wasm: Force stop iteration after local response is sent #13930

wasm: Force stop iteration after local response is sent #13930

mathetake commented Nov 7, 2020 •

edited

Loading

repokitteh-read-only bot commented Nov 7, 2020

PiotrSikora left a comment

PiotrSikora left a comment

antoniovicente Nov 10, 2020 •

edited

Loading

PiotrSikora Nov 10, 2020

antoniovicente Nov 10, 2020

PiotrSikora Nov 10, 2020

	FilterHeadersStatus Context2::onRequestHeaders(uint32_t, bool) {
	logDebug(std::string("onRequestHeaders2 ") + std::to_string(id()));
	CHECK_RESULT(sendLocalResponse(200, "ok", "body", {{"foo", "bar"}}));
	return FilterHeadersStatus::Continue;
	}

wasm: Force stop iteration after local response is sent #13930

wasm: Force stop iteration after local response is sent #13930

Conversation

mathetake commented Nov 7, 2020 • edited Loading

repokitteh-read-only bot commented Nov 7, 2020

PiotrSikora left a comment

Choose a reason for hiding this comment

PiotrSikora left a comment

Choose a reason for hiding this comment

antoniovicente Nov 10, 2020 • edited Loading

Choose a reason for hiding this comment

PiotrSikora Nov 10, 2020

Choose a reason for hiding this comment

antoniovicente Nov 10, 2020

Choose a reason for hiding this comment

PiotrSikora Nov 10, 2020

Choose a reason for hiding this comment

mathetake commented Nov 7, 2020 •

edited

Loading

antoniovicente Nov 10, 2020 •

edited

Loading