Skip to content

Upmerge 1.9.x to master#14348

Merged
mehrdada merged 42 commits intogrpc:masterfrom
mehrdada:upmerge
Feb 7, 2018
Merged

Upmerge 1.9.x to master#14348
mehrdada merged 42 commits intogrpc:masterfrom
mehrdada:upmerge

Conversation

@mehrdada
Copy link
Copy Markdown
Contributor

@mehrdada mehrdada commented Feb 7, 2018 •
edited
Loading

@nicolasnoble FYI, I have left the "Revert #13932" out of this upmerge

jtattermusch and others added 30 commits January 22, 2018 15:37
@jtattermusch
1.9.0-pre1 is now 1.9.0-pre2
3683ada
@jtattermusch
regenerate projects
2dc3b1e
@y-zeng
Add necessary retries for atomic state changes
f46028f
@y-zeng
Try again when idle_state is unexpected
c4431e4
@y-zeng
Fix asan issues
d1d605e
@y-zeng
Document idle_state transistions
b22befd
@y-zeng
Fix merge issues
6a15e4f
@y-zeng
Change if to switch, add more descriptions
a041e0f
@ZhouyihaiDing
php: fix call metadata leak
bc953bc
@ZhouyihaiDing
php: php_info add grpc version
1cd156d
@stanley-cheung
Merge pull request #14147 from ZhouyihaiDing/v1.9.x_php_info
76be4fe 
Backport PR #13687 into 1.9.x
@stanley-cheung
Merge pull request #14148 from ZhouyihaiDing/v1.9.x_call_metadata_leak
6641c02 
Backport PR #13660 into 1.9.x
@ZhouyihaiDing
php: fix channel reuse and wrapper memory leak
5b98d0b
@y-zeng
Merge pull request #14122 from y-zeng/max_age_19x
02384e3 
Backport #13594 to v1.9.x
@stanley-cheung
Merge pull request #14149 from ZhouyihaiDing/v1.9.x_php_channel_leak
d48e00e 
Backport PR #14125 - #14130 into 1.9.x
@stanley-cheung
PHP: Update release notes for 1.9
1827079
@stanley-cheung
Merge pull request #14154 from stanley-cheung/php-update-release-notes
7456752 
PHP: Update release notes for 1.9
@ZhouyihaiDing
php: fix call leaks
dea0f0b
@stanley-cheung
Merge pull request #14167 from ZhouyihaiDing/v1.9.x_php_call_leak
d782314 
Backport PR #14155 - #14161 into 1.9.x
@mehrdada
Merge pull request #14114 from jtattermusch/bump_190_pre2
167113f 
 1.9.0-pre1 is now 1.9.0-pre2
@nicolasnoble
Revert "Merge pull request #13932 from dgquintas/conn_subchannel"
ebe5fbf 
This reverts commit a889163, reversing
changes made to 47fe850.
@dgquintas
Merge pull request #14185 from nicolasnoble/revert-13932
357dc87 
Revert "Merge pull request #13932 from dgquintas/conn_subchannel"
@kpayson64
Don't segfault on header replay
1dc0833
@kpayson64
Merge pull request #14199 from kpayson64/bug_fix_1_9
389883f 
Don't segfault on header replay
@mehrdada
Bump version to 1.9.0-pre3
53f88d7
@mehrdada
Regenerate projects
812e5da
@mehrdada
Merge pull request #14205 from mehrdada/one-point-nine-arr-see-three-…
04ecc18 
…aaarrrrrgggggghhhhh

Bump version to 1.9.0-pre3
@mehrdada
Bump minimum Cython version to 0.27
bfcc994
@mehrdada
Merge pull request #14222 from mehrdada/bump-cython
1207963 
Bump Cython version to 0.27
@ctaggart
use SourceLink.Create.CommandLine instead of Embed
b6f737e
mehrdada and others added 12 commits January 31, 2018 16:21
@mehrdada
Promote 1.9.0-pre3 to 1.9.0
2338ec1
@mehrdada
Regenerate projects
e05ca22
@mehrdada
Merge pull request #14265 from mehrdada/releasetag
9b075f1 
Promote v1.9.0-pre3 to v1.9.0
@matt-kwong
Add release branch performance job
f9bd4d7
@matt-kwong
Kokoro performance job uploads to same BQ table as Jenkins
ade367d
@jtattermusch
Merge pull request #14231 from ctaggart/sourcelink-create
4c92ab2 
use SourceLink.Create.CommandLine instead of Embed
@matt-kwong
Merge pull request #14283 from matt-kwong/release-job-backport
f6c5c38 
Backport #14282 to v1.9.x
@kpayson64
Add refcounts for async callbacks in auth and client filters.
f069dd4
@kpayson64
Merge pull request #14315 from kpayson64/fix_refcounting
9e620c3 
Fixes refcounting issue
@kpayson64
Bump version to 1.9.1
1a8565d
@kpayson64
Merge pull request #14327 from kpayson64/bump_1_9_1
d45132a 
Bump version to 1.9.1
@mehrdada
Upmerge branch 'v1.9.x' into 'master'
b9335eb
@grpc-testing
Copy link
Copy Markdown

grpc-testing commented Feb 7, 2018 

****************************************************************

libgrpc.so

     VM SIZE                                                                                       FILE SIZE
 ++++++++++++++ GROWING                                                                         ++++++++++++++
   +17%    +448 src/core/ext/filters/max_age/max_age_filter.cc                                     +448   +17%
      [NEW]    +388 max_idle_timer_cb                                                                  +388  [NEW]
      +195%    +160 decrease_call_count                                                                +160  +195%
      +286%    +103 increase_call_count                                                                +103  +286%
      +2.1%     +16 init_channel_elem                                                                   +16  +2.1%
      +2.1%      +3 [Unmapped]                                                                           +3  +2.1%
  +0.1%     +16 src/core/ext/filters/client_channel/client_channel.cc                               +16  +0.1%
       +13%     +11 pick_callback_done_locked                                                           +11   +13%
      +1.8%      +5 [Unmapped]                                                                           +5  +1.8%
  +0.1%     +16 src/core/lib/surface/call.cc                                                        +16  +0.1%
      +6.8%     +16 publish_app_metadata(grpc_call*, grpc_metadata_batch*, int) [clone .isra.5]         +16  +6.8%

 -+-+-+-+-+-+-+ MIXED                                                                           +-+-+-+-+-+-+-
  -0.0%     -24 [None]                                                                          +1.17Ki  +0.0%

  +0.0%    +456 TOTAL                                                                           +1.64Ki  +0.0%


****************************************************************

libgrpc++.so

     VM SIZE        FILE SIZE
 ++++++++++++++  ++++++++++++++

  [ = ]       0        0  [ = ]

@mehrdada mehrdada requested a review from nicolasnoble February 7, 2018 04:34
@grpc-testing
Copy link
Copy Markdown

grpc-testing commented Feb 7, 2018 

[trickle] No significant performance differences

@grpc-testing
Copy link
Copy Markdown

grpc-testing commented Feb 7, 2018 

[microbenchmarks] No significant performance differences

@mehrdada
Copy link
Copy Markdown
Contributor Author

mehrdada commented Feb 7, 2018 •
edited
Loading

Test failures: #14354

@mehrdada mehrdada merged commit 890e386 into grpc:master Feb 7, 2018
@mehrdada mehrdada deleted the upmerge branch February 7, 2018 18:23
@lock lock bot locked as resolved and limited conversation to collaborators Jan 20, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@a11r a11r Awaiting requested review from a11r

@markdroth markdroth Awaiting requested review from markdroth

@nicolasnoble nicolasnoble Awaiting requested review from nicolasnoble

1 more reviewer

@dgquintas dgquintas dgquintas approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@nicolasnoble nicolasnoble

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.