Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade grpc to 1.57.2 #7073

Closed
wants to merge 105 commits into from
Closed

Upgrade grpc to 1.57.2 #7073

wants to merge 105 commits into from

Conversation

hanyuting8
Copy link
Contributor

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

1、In the replace of go.mod, due to weaveworks/common#239, The grpc version is 1.45.0, but there are vulnerabilities in this version. In order to fix CVE-2023-44478, the grpc version needs to be upgraded to 1.57.2
2、In order to upgrade GRPC, the version of weaveworks/common also needs to be upgraded, otherwise the build will fail

Verification

Dependency bump, verification automated on PR.

@yeya24
Copy link
Contributor

yeya24 commented Jan 18, 2024

Hi @hanyuting8, can you please sign DCO?

hanyuting8 and others added 25 commits January 19, 2024 18:55
Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
Use the new TSDB flag to disable overlapping compaction to fix OOO
samples handling in the Receive component.

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
…hanos-io#6898)

* [wip] First checkpoint

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* [wip] Second checkpoint

All tests passing, unit and e2e.

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Small random refactors

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Add some useful trace tags

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Concurrent and traced local writes

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Improve variable names in remote writes

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Rename `newFanoutForward` function

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* More refactors

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix linting issue

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Add a quorum test with sloppy quorum

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* [wip] Try to make retries work

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* [wip] Checkpoint: wait group still hanging

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Some refactors

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Add some commented code so I don't lose it

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Adapt tests

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove sloppy quorum code

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Move some code around

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove even more leftover of sloppy quorum

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Extract a type to hold function params

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove unused struct field

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove useless variable

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove type that wasn't used enough

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Delete function to tighten up max buffered responses

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Add comments to some functions

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix peer up check

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix size of replication tracking slices

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Rename context

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Don't do local writes concurrently

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove extra error logging

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix syntax after merge

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Add missing methods to peersContainer

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix handler test

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Reset peers state on hashring changes

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Handle PR comment regarding waitgroup

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Set span tags to help debug

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix concurrency issue

We close the request as soon as quorum is reached and leave a few Go routines running to finish replication and so cleanups.

This means that the context from the HTTP request is cancelled... which ends up also cancelling the pending replication requests.

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix request ID middleware

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Fix `distributeTimeseriesToReplicas` comment

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Extract var with 1-indexed replication index

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Rename methods in peersContainer interface

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Make peerGroup `getConnection` check if peers are up

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove yet one more not useful log

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

* Remove logger from `h.sendWrites`

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

---------

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 0ed57f6.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 730da78.

Signed-off-by: hanyuting8 <hytxidian@163.com>
…)" (thanos-io#7053)

This reverts commit 7b8eb86.

Proper way to handle this is to disable vertical compaction. I am trying
to add this functionality here:
prometheus/prometheus#13393

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: Kartikay <120778728+kartikaysaxena@users.noreply.github.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
Signed-off-by: hanyuting8 <hytxidian@163.com>
Forced tracing was.. Forced true always, even if the checkbox in the UI
to enable tracing was not actually checked.

Signed-off-by: Jacob Baungard Hansen <jacobbaungard@redhat.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
Update Prometheus version to include
prometheus/prometheus#13242 which is important
for me - it unblocks further postings work.

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
…os-io#7043)

* Make RetryError and HaltError able to be fetched for root cause

Signed-off-by: Alex Le <leqiyue@amazon.com>

* Added unit test

Signed-off-by: Alex Le <leqiyue@amazon.com>

* fix lint

Signed-off-by: Alex Le <leqiyue@amazon.com>

* fixed IsRetryError and IsHaltError functions

Signed-off-by: Alex Le <leqiyue@amazon.com>

---------

Signed-off-by: Alex Le <leqiyue@amazon.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 0ed57f6.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 730da78.

Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 0ed57f6.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 730da78.

Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 0ed57f6.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 730da78.

Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit ff9f174.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 0ed57f6.

Signed-off-by: hanyuting8 <hytxidian@163.com>
This reverts commit 730da78.

Signed-off-by: hanyuting8 <hytxidian@163.com>
@hanyuting8 hanyuting8 closed this Jan 19, 2024
@hanyuting8 hanyuting8 reopened this Jan 19, 2024
@hanyuting8 hanyuting8 closed this Jan 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet