v1.6 backports 2020-07-30 #12724
Merged
v1.6 backports 2020-07-30 #12724
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
qmonnet
added
backport/1.6
kind/backports
|
test-backport-1.6 |
gandro
approved these changes
Jul 30, 2020
[ upstream commit 037bef5 ] Previously, we did not take into account 'from-network' sources in the monitor aggregation logic check in `send_trace_notify()`, which was fine because we rarely ever sent such events (limited to ipsec for instance). However, since commit c470e28 we also use this in bpf_host which suddenly means that any and all traffic from the network will trigger monitor events, flooding the monitor output. Fixes: 7a4b0be ("bpf: Add MonitorAggregation option") Fixes: c470e28 ("Adds TRACE_TO_NETWORK obs label and trace pkts in to-netdev prog.") Fixes: #12555 Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 1797d0e ] Previously, if "set-labels.py" was in the PR title, then the `grep` would pick up extraneous lines which throw off the parsing. See failed example below: ``` $ ./contrib/backporting/submit-backport v1.8 ... Updating labels for PRs * #12640 -- backporting: Report progress in set-labels.py (@pchaigno) 12640 12626 12632 12654 12651 12652 12659 12521 12683 Set labels for all PRs above? [y/N] y usage: set-labels.py [-h] pr_number {pending,done} [version] set-labels.py: error: argument pr_number: invalid int value: 'api' Signal ERR caught! ``` Fixes: 3c4d43a ("contrib: Fix submit-backport PR set-labels detection") Signed-off-by: Chris Tarazi <chris@isovalent.com> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
qmonnet
force-pushed
the
pr/v1.6-backport-2020-07-30
branch
from
371b982
to
27a28b3
Compare
|
“Ah, right, this daemon/bpf.sha thing...” |
joestringer
approved these changes
Jul 30, 2020
christarazi
approved these changes
Jul 30, 2020
|
test-upstream-k8s |
maintainer-s-little-helper
bot
added
the
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Once this PR is merged, you can update the PR labels via: