Issue 1570343005: relnote: Implement server push methods in QuicSimpleServerSession. Only modify toy Quic server, not…

Issue 1570343005: relnote: Implement server push methods in QuicSimpleServerSession. Only modify toy Quic server, not… (Closed)

Created:
4 years, 11 months ago by Zhongyi Shi

Modified:
4 years, 11 months ago

Reviewers:
danzh1, Ryan Hamilton

CC:
chromium-reviews, cbentzel+watch_chromium.org

Base URL:
https://chromium.googlesource.com/chromium/src.git@0044_CL_111708360

Target Ref:
refs/pending/heads/master

Project:
chromium

Visibility:
Public.

More Reviews

Description

relnote: Implement server push methods in QuicSimpleServerSession. Only modify toy Quic server, not used in production. Merege internal change: 111716301 BUG=

Patch Set 1 #

Patch Set 2 : rebase from master for danzh to patch #

Patch Set 3 : fix URL.AssemblyURL #

Patch Set 4 : rebase to chain after fix #

Created: 4 years, 11 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+645 lines, -62 lines)			Patch
M	net/quic/quic_connection.h	View	2 3	1 chunk	+6 lines, -6 lines	0 comments	Download
M	net/quic/quic_headers_stream.h	View	2 3	2 chunks	+2 lines, -2 lines	0 comments	Download
M	net/quic/quic_session.h	View		4 chunks	+33 lines, -16 lines	0 comments	Download
M	net/quic/quic_session.cc	View	2 3	3 chunks	+24 lines, -8 lines	0 comments	Download
M	net/quic/quic_spdy_stream.h	View	2 3	1 chunk	+1 line, -0 lines	0 comments	Download
M	net/tools/quic/quic_simple_server_session.h	View		3 chunks	+89 lines, -1 line	0 comments	Download
M	net/tools/quic/quic_simple_server_session.cc	View		4 chunks	+132 lines, -1 line	0 comments	Download
M	net/tools/quic/quic_simple_server_session_test.cc	View		9 chunks	+230 lines, -22 lines	0 comments	Download
M	net/tools/quic/quic_simple_server_stream.cc	View	1 2	3 chunks	+22 lines, -4 lines	0 comments	Download
M	net/tools/quic/quic_simple_server_stream_test.cc	View		6 chunks	+106 lines, -2 lines	0 comments	Download

Depends on Patchset:

Issue 1569853005 Patch 20001

Dependent Patchsets:

Issue 1572033003 Patch 20001

Messages

Total messages: 6 (2 generated)

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages

Zhongyi Shi

Patching the cl on chromium, test failure in QuicSimpleServerStreamTest.SendReponseWithPushResources. Dan, could you please take a ...

4 years, 11 months ago (2016-01-09 02:35:02 UTC) #2

Patching the cl on chromium, test failure in
QuicSimpleServerStreamTest.SendReponseWithPushResources. Dan, could you please
take a look?

Test outputs:
Tests/QuicSimpleServerStreamTest.SendReponseWithPushResources/0
[92719:92719:0108/183404:2238078044924:VERBOSE1:quic_connection.cc(320)] Server:
Created connection with connection_id: 42
[92719:92719:0108/183405:2238078193602:VERBOSE1:quic_flow_controller.cc(40)]
Server: Created flow controller for stream 0, setting initial receive window
offset to: 1572864, max receive window to: 1572864, max receive window limit to:
25165824, setting send window offset to: 16384
[92719:92719:0108/183405:2238078193717:VERBOSE1:quic_session.cc(736)] Setting
max_open_streams_ to 100
[92719:92719:0108/183405:2238078193749:VERBOSE1:quic_session.cc(737)] Setting
get_max_available_streams() to 1000
[92719:92719:0108/183405:2238078193898:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:host, )
[92719:92719:0108/183405:2238078193956:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:authority, www.google.com)
[92719:92719:0108/183405:2238078194004:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:path, /)
[92719:92719:0108/183405:2238078194036:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:method, POST)
[92719:92719:0108/183405:2238078194081:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:version, HTTP/1.1)
[92719:92719:0108/183405:2238078194112:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (content-length, 11)
[92719:92719:0108/183405:2238078194270:VERBOSE1:quic_flow_controller.cc(40)]
Server: Created flow controller for stream 5, setting initial receive window
offset to: 1048576, max receive window to: 1048576, max receive window limit to:
16777216, setting send window offset to: 16384
[92719:92719:0108/183405:2238078194342:VERBOSE1:quic_session.cc(614)] Server:
num_streams: 0. activating 5
[92719:92719:0108/183405:2238078194511:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:status, 200)
[92719:92719:0108/183405:2238078194559:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (content-length, 5)
[92719:92719:0108/183405:2238078194734:VERBOSE1:quic_in_memory_cache.cc(235)]
Add request-resource association.
[92719:92719:0108/183405:2238078194815:VERBOSE1:quic_in_memory_cache.cc(242)]
Add response for push resource Push body
[92719:92719:0108/183405:2238078194923:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:path, /foo)
[92719:92719:0108/183405:2238078194967:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:authority, www.google.com)
[92719:92719:0108/183405:2238078195005:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:version, HTTP/1.1)
[92719:92719:0108/183405:2238078195038:VERBOSE1:spdy_header_block.cc(122)]
Inserting: (:method, GET)
[92719:92719:0108/183405:2238078195398:VERBOSE1:quic_simple_server_stream.cc(173)]
Found 0 push resources for stream 5
[92719:92719:0108/183405:2238078195440:VERBOSE1:quic_simple_server_stream.cc(183)]
Sending response for stream 5
[92719:92719:0108/183405:2238078195473:VERBOSE1:reliable_quic_stream.cc(383)]
Server: Stop reading from stream 5
[92719:92719:0108/183405:2238078195535:VERBOSE1:quic_stream_sequencer.cc(193)]
Flushing buffered data at offset 0 length 0 for stream 5
[92719:92719:0108/183405:2238078195583:VERBOSE1:quic_flow_controller.cc(50)]
Server: Stream 5 consumed: 0
[92719:92719:0108/183405:2238078195610:VERBOSE1:quic_flow_controller.cc(178)]
Server: Not sending WindowUpdate for stream 5, available window: 1048576 >=
threshold: 524288
[92719:92719:0108/183405:2238078195635:VERBOSE1:quic_flow_controller.cc(50)]
Server: Stream 0 consumed: 0
[92719:92719:0108/183405:2238078195659:VERBOSE1:quic_flow_controller.cc(178)]
Server: Not sending WindowUpdate for stream 0, available window: 1572864 >=
threshold: 786432
[92719:92719:0108/183405:2238078195685:VERBOSE1:quic_simple_server_stream.cc(214)]
Writing headers (fin = 0) : 
{
  :status:200
  content-length:5
}

unknown file: Failure

Unexpected mock function call - returning default value.
    Function call: WriteHeaders(5, @0x2fe1756aa3e8 { (:status, 200),
(content-length, 5) }, false, '\x3' (3), NULL)
          Returns: 0
Google Mock tried the following 1 expectation, but it didn't match:

../../net/tools/quic/quic_simple_server_stream_test.cc:393:
EXPECT_CALL(session_, WriteHeaders(stream_->id(), _, false, _, nullptr))...
         Expected: all pre-requisites are satisfied
           Actual: the following immediate pre-requisites are not satisfied:
../../net/tools/quic/quic_simple_server_stream_test.cc:392: pre-requisite #0
                   (end of pre-requisites)
         Expected: to be called once
           Actual: never called - unsatisfied and active
[92719:92719:0108/183405:2238078196154:VERBOSE1:quic_simple_server_stream.cc(224)]
Writing body (fin = 1) with size: 5
unknown file: Failure

Unexpected mock function call - taking default action specified at:
../../net/tools/quic/quic_simple_server_stream_test.cc:94:
    Function call: WritevData(5, 24-byte object <A0-BF C8-79 FC-7F 00-00 01-00
00-00 00-00 00-00 05-00 00-00 00-00 00-00>, 0, true, 1, NULL)
          Returns: bytes_consumed: 0 fin_consumed: 0
Google Mock tried the following 1 expectation, but it didn't match:

../../net/tools/quic/quic_simple_server_stream_test.cc:394:
EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))...
         Expected: all pre-requisites are satisfied
           Actual: the following immediate pre-requisites are not satisfied:
../../net/tools/quic/quic_simple_server_stream_test.cc:393: pre-requisite #0
                   (end of pre-requisites)
         Expected: to be called once
           Actual: never called - unsatisfied and active
[92719:92719:0108/183405:2238078196536:VERBOSE1:quic_flow_controller.cc(88)]
Server: Stream 5 sent: 0
[92719:92719:0108/183405:2238078196565:VERBOSE1:quic_flow_controller.cc(88)]
Server: Stream 0 sent: 0
../../net/tools/quic/quic_simple_server_stream_test.cc:392: Failure
Actual function call count doesn't match EXPECT_CALL(session_,
PromisePushResources(host + request_path, _, ::net::test::kClientDataStreamId1,
*request_headers))...
         Expected: to be called once
           Actual: never called - unsatisfied and active
../../net/tools/quic/quic_simple_server_stream_test.cc:393: Failure
Actual function call count doesn't match EXPECT_CALL(session_,
WriteHeaders(stream_->id(), _, false, _, nullptr))...
         Expected: to be called once
           Actual: never called - unsatisfied and active
../../net/tools/quic/quic_simple_server_stream_test.cc:394: Failure
Actual function call count doesn't match EXPECT_CALL(session_, WritevData(_, _,
_, _, _, _))...
         Expected: to be called once
           Actual: never called - unsatisfied and active
[  FAILED  ] Tests/QuicSimpleServerStreamTest.SendReponseWithPushResources/0,
where GetParam() = 30 (154 ms)
[----------] 1 test from Tests/QuicSimpleServerStreamTest (154 ms total)

[----------] Global test environment tear-down
Tests/QuicSimpleServerStreamTest.SendReponseWithPushResources/0, where
GetParam() = 30

danzh1

On 2016/01/09 02:35:02, Zhongyi Shi wrote: > Patching the cl on chromium, test failure in ...

4 years, 11 months ago (2016-01-11 17:14:37 UTC) #4

On 2016/01/09 02:35:02, Zhongyi Shi wrote:
> Patching the cl on chromium, test failure in
> QuicSimpleServerStreamTest.SendReponseWithPushResources. Dan, could you please
> take a look?
> 
> Test outputs:
> Tests/QuicSimpleServerStreamTest.SendReponseWithPushResources/0
> [92719:92719:0108/183404:2238078044924:VERBOSE1:quic_connection.cc(320)]
Server:
> Created connection with connection_id: 42
> [92719:92719:0108/183405:2238078193602:VERBOSE1:quic_flow_controller.cc(40)]
> Server: Created flow controller for stream 0, setting initial receive window
> offset to: 1572864, max receive window to: 1572864, max receive window limit
to:
> 25165824, setting send window offset to: 16384
> [92719:92719:0108/183405:2238078193717:VERBOSE1:quic_session.cc(736)] Setting
> max_open_streams_ to 100
> [92719:92719:0108/183405:2238078193749:VERBOSE1:quic_session.cc(737)] Setting
> get_max_available_streams() to 1000
> [92719:92719:0108/183405:2238078193898:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:host, )
> [92719:92719:0108/183405:2238078193956:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:authority, http://www.google.com)
> [92719:92719:0108/183405:2238078194004:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:path, /)
> [92719:92719:0108/183405:2238078194036:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:method, POST)
> [92719:92719:0108/183405:2238078194081:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:version, HTTP/1.1)
> [92719:92719:0108/183405:2238078194112:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (content-length, 11)
> [92719:92719:0108/183405:2238078194270:VERBOSE1:quic_flow_controller.cc(40)]
> Server: Created flow controller for stream 5, setting initial receive window
> offset to: 1048576, max receive window to: 1048576, max receive window limit
to:
> 16777216, setting send window offset to: 16384
> [92719:92719:0108/183405:2238078194342:VERBOSE1:quic_session.cc(614)] Server:
> num_streams: 0. activating 5
> [92719:92719:0108/183405:2238078194511:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:status, 200)
> [92719:92719:0108/183405:2238078194559:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (content-length, 5)
> [92719:92719:0108/183405:2238078194734:VERBOSE1:quic_in_memory_cache.cc(235)]
> Add request-resource association.
> [92719:92719:0108/183405:2238078194815:VERBOSE1:quic_in_memory_cache.cc(242)]
> Add response for push resource Push body
> [92719:92719:0108/183405:2238078194923:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:path, /foo)
> [92719:92719:0108/183405:2238078194967:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:authority, http://www.google.com)
> [92719:92719:0108/183405:2238078195005:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:version, HTTP/1.1)
> [92719:92719:0108/183405:2238078195038:VERBOSE1:spdy_header_block.cc(122)]
> Inserting: (:method, GET)
>
[92719:92719:0108/183405:2238078195398:VERBOSE1:quic_simple_server_stream.cc(173)]
> Found 0 push resources for stream 5
>
[92719:92719:0108/183405:2238078195440:VERBOSE1:quic_simple_server_stream.cc(183)]
> Sending response for stream 5
> [92719:92719:0108/183405:2238078195473:VERBOSE1:reliable_quic_stream.cc(383)]
> Server: Stop reading from stream 5
> [92719:92719:0108/183405:2238078195535:VERBOSE1:quic_stream_sequencer.cc(193)]
> Flushing buffered data at offset 0 length 0 for stream 5
> [92719:92719:0108/183405:2238078195583:VERBOSE1:quic_flow_controller.cc(50)]
> Server: Stream 5 consumed: 0
> [92719:92719:0108/183405:2238078195610:VERBOSE1:quic_flow_controller.cc(178)]
> Server: Not sending WindowUpdate for stream 5, available window: 1048576 >=
> threshold: 524288
> [92719:92719:0108/183405:2238078195635:VERBOSE1:quic_flow_controller.cc(50)]
> Server: Stream 0 consumed: 0
> [92719:92719:0108/183405:2238078195659:VERBOSE1:quic_flow_controller.cc(178)]
> Server: Not sending WindowUpdate for stream 0, available window: 1572864 >=
> threshold: 786432
>
[92719:92719:0108/183405:2238078195685:VERBOSE1:quic_simple_server_stream.cc(214)]
> Writing headers (fin = 0) : 
> {
>   :status:200
>   content-length:5
> }
> 
> unknown file: Failure
> 
> Unexpected mock function call - returning default value.
>     Function call: WriteHeaders(5, @0x2fe1756aa3e8 { (:status, 200),
> (content-length, 5) }, false, '\x3' (3), NULL)
>           Returns: 0
> Google Mock tried the following 1 expectation, but it didn't match:
> 
> ../../net/tools/quic/quic_simple_server_stream_test.cc:393:
> EXPECT_CALL(session_, WriteHeaders(stream_->id(), _, false, _, nullptr))...
>          Expected: all pre-requisites are satisfied
>            Actual: the following immediate pre-requisites are not satisfied:
> ../../net/tools/quic/quic_simple_server_stream_test.cc:392: pre-requisite #0
>                    (end of pre-requisites)
>          Expected: to be called once
>            Actual: never called - unsatisfied and active
>
[92719:92719:0108/183405:2238078196154:VERBOSE1:quic_simple_server_stream.cc(224)]
> Writing body (fin = 1) with size: 5
> unknown file: Failure
> 
> Unexpected mock function call - taking default action specified at:
> ../../net/tools/quic/quic_simple_server_stream_test.cc:94:
>     Function call: WritevData(5, 24-byte object <A0-BF C8-79 FC-7F 00-00 01-00
> 00-00 00-00 00-00 05-00 00-00 00-00 00-00>, 0, true, 1, NULL)
>           Returns: bytes_consumed: 0 fin_consumed: 0
> Google Mock tried the following 1 expectation, but it didn't match:
> 
> ../../net/tools/quic/quic_simple_server_stream_test.cc:394:
> EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))...
>          Expected: all pre-requisites are satisfied
>            Actual: the following immediate pre-requisites are not satisfied:
> ../../net/tools/quic/quic_simple_server_stream_test.cc:393: pre-requisite #0
>                    (end of pre-requisites)
>          Expected: to be called once
>            Actual: never called - unsatisfied and active
> [92719:92719:0108/183405:2238078196536:VERBOSE1:quic_flow_controller.cc(88)]
> Server: Stream 5 sent: 0
> [92719:92719:0108/183405:2238078196565:VERBOSE1:quic_flow_controller.cc(88)]
> Server: Stream 0 sent: 0
> ../../net/tools/quic/quic_simple_server_stream_test.cc:392: Failure
> Actual function call count doesn't match EXPECT_CALL(session_,
> PromisePushResources(host + request_path, _,
::net::test::kClientDataStreamId1,
> *request_headers))...
>          Expected: to be called once
>            Actual: never called - unsatisfied and active
> ../../net/tools/quic/quic_simple_server_stream_test.cc:393: Failure
> Actual function call count doesn't match EXPECT_CALL(session_,
> WriteHeaders(stream_->id(), _, false, _, nullptr))...
>          Expected: to be called once
>            Actual: never called - unsatisfied and active
> ../../net/tools/quic/quic_simple_server_stream_test.cc:394: Failure
> Actual function call count doesn't match EXPECT_CALL(session_, WritevData(_,
_,
> _, _, _, _))...
>          Expected: to be called once
>            Actual: never called - unsatisfied and active
> [  FAILED  ] Tests/QuicSimpleServerStreamTest.SendReponseWithPushResources/0,
> where GetParam() = 30 (154 ms)
> [----------] 1 test from Tests/QuicSimpleServerStreamTest (154 ms total)
> 
> [----------] Global test environment tear-down
> Tests/QuicSimpleServerStreamTest.SendReponseWithPushResources/0, where
> GetParam() = 30

seems that PromisedPushResources() is not called. Can you verify in
QuicSimpleServerStream.cc whether this if block is reached?

 176   if (!resources.empty()) {
 177     QuicSimpleServerSession* session =
 178         static_cast<QuicSimpleServerSession*>(spdy_session());
 179     session->PromisePushResources(request_url, resources, id(),
 180                                   request_headers_);
 181   }

danzh1

4 years, 11 months ago (2016-01-12 15:08:23 UTC) #6

On 2016/01/11 23:40:14, Zhongyi Shi wrote:
> The CQ bit was checked by mailto:zhongyi@chromium.org to run a CQ dry run

lgtm

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages