Skip to content

Upgrade benchmark to 1.6.0 and remove previous hacks.#27778

Merged
veblush merged 7 commits intogrpc:masterfrom
oontvoo:upgrade_bm_2
Oct 27, 2021
Merged

Upgrade benchmark to 1.6.0 and remove previous hacks.#27778
veblush merged 7 commits intogrpc:masterfrom
oontvoo:upgrade_bm_2

Conversation

@oontvoo
Copy link
Copy Markdown
Contributor

@oontvoo oontvoo commented Oct 19, 2021

Details:

  • GRPC currently uses an old version of benchmark (from Sept 2020). It should probably upgrade because downstream, in google3, everyone is already using 1.6.0)
  • Removed the hack added in PR/27629 to allow benchmarks in GRPC to continue to work with both pre-1.6.0 and 1.6.0 benchmarks.
    (This was needed to allow importing benchmarks 1.6.0 into google3 without breaking GRPC)

Background:
This originated from PR/27505 - From various discussions internally, we've decided it was simpler to add the hack (PR/27629), do the import, then revert the hack and upgrade benchmark versions.

@markdroth @veblush @dominichamon

Details:
 - GRPC currently uses an old version of benchmark (from Sept 2020). It should probably upgrade because downstream, in google3, everyone is already using 1.6.0)
 - Removed the hack added in PR/27629 to allow benchmarks in GRPC to continue to work with both pre-1.6.0 and 1.6.0 benchmarks.
   (This was needed to allow importing benchmarks 1.6.0 into google3 without breaking GRPC)
@jtattermusch
Copy link
Copy Markdown
Contributor

@veblush please review.

@jtattermusch
Copy link
Copy Markdown
Contributor

@veblush please review.

Copy link
Copy Markdown
Contributor

@veblush veblush left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the PR!

@veblush
Copy link
Copy Markdown
Contributor

veblush commented Oct 21, 2021

@oontvoo Two more things are needed;

  • Updating third_party/benchmark
  • Updating tools/run_tests/sanity/check_submodules.sh

The PR for previous upgrade (#25184) would be helpful.

@oontvoo
Copy link
Copy Markdown
Contributor Author

oontvoo commented Oct 21, 2021

@oontvoo Two more things are needed;

  • Updating third_party/benchmark
  • Updating tools/run_tests/sanity/check_submodules.sh

The PR for previous upgrade (#25184) would be helpful.

Thanks. For the third_party/benchmark, what I ran was:

cd third_party/benchmark            
git fetch origin

 # the revision we're updating to since there're no release branches on benchmark
git checkout 0baacde3618ca617da95375e0af13ce1baadea47

Please verify these were the correct steps.

@veblush
Copy link
Copy Markdown
Contributor

veblush commented Oct 21, 2021

It looks right. Let's see what Kokoro will say.

@oontvoo
Copy link
Copy Markdown
Contributor Author

oontvoo commented Oct 26, 2021

Hi, friendly ping?
It seems the iOS failures are unrelated
Thanks!

@veblush
Copy link
Copy Markdown
Contributor

veblush commented Oct 26, 2021

@oontvoo Would you run tools/buildgen/generate_projects.py ? I has a following error;

>         'third_party/benchmark/src/perf_counters.cc',
Traceback (most recent call last):
  File "tools/buildgen/generate_projects.py", line 144, in <module>
    main()
  File "tools/buildgen/generate_projects.py", line 136, in main
    assert 0 == os.system('diff %s %s' % (s, g)), s
AssertionError: ./grpc.gyp

2021-10-26 07:41:21,955 FAILED: tools/buildgen/generate_projects.sh [ret=1, pid=1180, time=106.6sec]

oontvoo and others added 3 commits October 26, 2021 16:31
* Bump version to v1.41.0-pre1 (grpc#27371)

* Bump version to v1.41.0-pre1

* Regenerate projects

* [Backport grpc#27373] add testing_version flag (grpc#27385)

* Bump version to v1.41.0-pre2 (grpc#27390)

* Bump version to v1.41.0-pre2

* Regenerate projects

* Core 19: bump core version from 18.0.0 to 19.0.0 (grpc#27394)

* Bump core version to 19.0.0

* Regenerate projects

* fix use-after-free metadata corruption in C# when receiving response headers for streaming response calls (grpc#27398)

* Final release: bump up version to 1.41.0 (grpc#27476)

* Bump version to 1.41.0

* Regenerate projects

* xds_k8s_test: increase timeout to 3 hours due to recent timeout failure (grpc#27580)

* Revert "xds_k8s_test: increase timeout to 3 hours due to recent timeout failure (grpc#27580)" (grpc#27590)

This reverts commit da0c7d6.

* Update root pem certs (backport of grpc#27539) (grpc#27619)

* Update boringssl to the latest (grpc#27606) (grpc#27625)

* Change boringssl branch name

* update submodule boringssl-with-bazel with origin/main-with-bazel

* update boringssl dependency to main-with-bazel commit SHA

* regenerate files

* Increment podspec version

* generate boringssl prefix headers

* Bumping up version to v1.41.1 (grpc#27699)

* Bump version to v1.41.1

* Regenerate projects

* [Backport][v1.41.x] xds-k8s tests: Use test driver from master branch (grpc#27695)

Backports sourcing the test driver install script from master.

This is a backport of grpc#27389, grpc#27462 and grpc#27658:


* Add missing quatation marks.

These were missed when  creating the Python virtual env.

* xds-k8s tests: Use test driver from master branch (grpc#27462)

Instead of directly sourcing the test driver provisioning script from the same branch, the script is downloaded (with curl) and sourced from the master branch.

This allows changes made to the test driver to be reflected in all future release branches. A separate PR will backport this change to existing release branches.

All cluster definitions are also moved to the install script, allowing any cluster changes to be done in one place in the master branch.

* xds_k8s tests: Fix xlang install script sourcing. (grpc#27658)

This change sources the test driver install script correctly for the xlang tests.
This fixes a mistake in grpc#27462 where this was missed.

* Fix Python Interop (grpc#27620) (grpc#27703)

* WIP. Attempt to fix interop

* Yapf

* Switch Python xDS Example Server to Listen on IPV4 Only (grpc#27679)

* Switch to IPV4

* Update to all hosts

* Fix rvm ruby install failure (grpc#27769)

Co-authored-by: donnadionne <[email protected]>
Co-authored-by: Lidi Zheng <[email protected]>
Co-authored-by: Jan Tattermusch <[email protected]>
Co-authored-by: sanjaypujare <[email protected]>
Co-authored-by: Sergii Tkachenko <[email protected]>
Co-authored-by: Esun Kim <[email protected]>
Co-authored-by: Terry Wilson <[email protected]>
Co-authored-by: Richard Belleville <[email protected]>
@veblush veblush merged commit 70b26a1 into grpc:master Oct 27, 2021
@copybara-service copybara-service bot added the imported Specifies if the PR has been imported to the internal repository label Oct 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

imported Specifies if the PR has been imported to the internal repository lang/c++ release notes: no Indicates if PR should not be in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants