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.

Sign up for GitHub

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

Jump to bottom

v1.13 backport for #26197 #26200

Merged
merged 1 commit into from
Jun 14, 2023
Merged

v1.13 backport for #26197 #26200

merged 1 commit into from
Jun 14, 2023

Conversation

michi-covalent
Copy link
Contributor

@michi-covalent michi-covalent commented Jun 13, 2023 •
edited

Once this PR is merged, you can update the PR labels via:

$ for pr in 26197; do contrib/backporting/set-labels.py $pr done 1.13; done

@ti-mo @michi-covalent
ctmap: right-shift kernel jiffies by BPF_MONO_SCALER
62fd99f 
[ upstream commit 3eaca5d ]

Commit 8531c5a ("bpf,datapath: read jiffies from /proc/schedstat")
switched package ctmap over to using /proc/schedstat for getting
kernel jiffies.

During the conversion, a shift by a magic 'scaler' value was missed,
leading to strange output in `cilium bpf ct list global -d`
(.. (remaining: -4391264792 sec(s)) ..) and the CT GC never collecting
any flows, since the current jiffies were always perceived to be orders
of magnitude larger than the flow expiry time.

This patch wraps probes.Jiffies() in a documented scaledJiffies() helper
and declares the BPF_MONO_SCALER macro as a Go constant.

Signed-off-by: Timo Beckers <timo@isovalent.com>
Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
@michi-covalent michi-covalent requested a review from a team as a code owner June 13, 2023 22:28
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Jun 13, 2023
@michi-covalent michi-covalent mentioned this pull request Jun 13, 2023
Closed
7 tasks
ti-mo
ti-mo approved these changes Jun 13, 2023
View reviewed changes
Copy link
Contributor

@ti-mo ti-mo left a comment

Choose a reason for hiding this comment

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

Thanks!

@michi-covalent
Copy link
Contributor Author

michi-covalent commented Jun 13, 2023 •
edited by maintainer-s-little-helper bot

/test-backport-1.13

Job 'Cilium-PR-K8s-1.24-kernel-4.19' failed:

Click to show.

Test Name

K8sDatapathServicesTest Checks E/W loadbalancing (ClusterIP, NodePort from inside cluster, etc) with L7 policy Tests NodePort with L7 Policy

Failure Output

FAIL: Request from testclient-48nwm pod to service tftp://[fd04::11]:31143/hello failed

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.24-kernel-4.19/39/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.24-kernel-4.19 so I can create one.

Then please upload the Jenkins artifacts to that issue.

Job 'Cilium-PR-K8s-1.26-kernel-net-next' failed:

Click to show.

Test Name

K8sDatapathServicesTest Checks E/W loadbalancing (ClusterIP, NodePort from inside cluster, etc) Checks in-cluster KPR Tests HealthCheckNodePort

Failure Output

FAIL: Request from k8s1 to "http://192.168.56.12:31307" returned HTTP Code "503", expected "200"

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.26-kernel-net-next/778/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.26-kernel-net-next so I can create one.

Then please upload the Jenkins artifacts to that issue.

@michi-covalent
Copy link
Contributor Author

i'm guessing that ClusterMesh (ci-multicluster-1.13) should be marked as required https://github.com/cilium/cilium/actions/runs/5261127073 instead of Multicluster / Cluster mesh (ci-multicluster-1.13). @aanm / @joestringer could you update the branch protection rules? 🙏 cc @giorio94

@michi-covalent
Copy link
Contributor Author

all the tests passed, including ClusterMesh (ci-multicluster-1.13). Multicluster / Cluster mesh (ci-multicluster-1.13) no longer exists. time to 🚀

@michi-covalent michi-covalent merged commit cd3cbaa into cilium:v1.13 Jun 14, 2023
97 of 98 checks passed
@michi-covalent michi-covalent deleted the pr/v1.13-backport-2023-06-13 branch June 14, 2023 02:22
@michi-covalent michi-covalent mentioned this pull request Jun 14, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ti-mo ti-mo ti-mo approved these changes

@qmonnet qmonnet qmonnet approved these changes

Assignees
No one assigned
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@michi-covalent @ti-mo @qmonnet