Skip to content

Cherry-pick flake fix for 1.3.x#11322

Merged
apolcyn merged 1 commit intogrpc:v1.3.xfrom
apolcyn:fix_flake
May 30, 2017
Merged

Cherry-pick flake fix for 1.3.x#11322
apolcyn merged 1 commit intogrpc:v1.3.xfrom
apolcyn:fix_flake

Conversation

@apolcyn
Copy link
Copy Markdown
Contributor

@apolcyn apolcyn commented May 26, 2017

cherry-picks this change from the upmerge PR to the 1.3.x branch. (this test flakes easily under ubsan)

Gets rid of asserts for non-zero amounts of "watchers" after calling watch_connectivity_state, since their count is increased under a combiner; closure might not have ran yet.

@apolcyn apolcyn requested a review from dgquintas May 26, 2017 20:52
@apolcyn apolcyn mentioned this pull request May 26, 2017
Merged
@grpc-kokoro
Copy link
Copy Markdown
Collaborator

grpc-kokoro commented May 26, 2017 

Performance differences noted:
Benchmark                                                    cpu_time    real_time
---------------------------------------------------------  ----------  -----------
BM_ClosureSched2OnCombiner                                     +12.50       +12.50
BM_ClosureSched2OnTwoCombiners                                 +12.50       +12.50
BM_ClosureSched3OnCombiner                                     +16.00       +16.00
BM_ClosureSchedOnCombiner                                       +6.50        +6.50
BM_HpackParserParseHeader<NonIndexedBinaryElem<10, true>>      +30.00       +30.00
BM_HpackParserParseHeader<NonIndexedBinaryElem<31, true>>      +34.00       +34.00
BM_IsolatedCall_StreamingSend                                  +19.00       +19.00
BM_IsolatedFilter<HttpServerFilter, SendEmptyMetadata>          +7.00        +7.00
BM_IsolatedFilter<MessageSizeFilter, SendEmptyMetadata>         +5.50        +5.50
BM_LameChannelCallCreateCpp                                   +427.00      +427.00
BM_MetadataFromInternedKey                                      -7.00        -7.00
BM_Pass1Core                                                   +14.00       +14.00
BM_Pass1Cpp                                                    +13.00       +13.00
BM_PollEmptyPollset_SpeedOfLight/1/0                            -8.50        -8.50
BM_PollEmptyPollset_SpeedOfLight/1/10                          -10.00       -10.00
BM_PollEmptyPollset_SpeedOfLight/1/100                         -10.00       -10.00
BM_PollEmptyPollset_SpeedOfLight/1/1000                         -9.50        -9.50
BM_PollEmptyPollset_SpeedOfLight/100/1                          -9.00        -9.00
BM_PollEmptyPollset_SpeedOfLight/1000/1                         -9.00        -9.00
BM_SingleThreadPollOneFd                                      -104.00      -104.00
BM_SingleThreadPollOneFd_SpeedOfLight                          -66.50       -66.50
BM_SliceIntern                                                 -19.50       -19.50
BM_SliceReIntern                                                -8.00        -8.00
BM_Zalloc/1024                                                  +8.50        +8.50

@apolcyn
Copy link
Copy Markdown
Contributor Author

apolcyn commented May 30, 2017

test failures:

@apolcyn apolcyn merged commit 81a1978 into grpc:v1.3.x May 30, 2017
@lock lock bot locked as resolved and limited conversation to collaborators Jan 23, 2019
@lock lock bot unassigned dgquintas Jan 23, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@dgquintas dgquintas dgquintas approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/core cla: yes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@apolcyn @grpc-kokoro @dgquintas @googlebot