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

v1.13 backports 2023-06-13 #26199

Conversation

michi-covalent
Copy link
Contributor

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

$ for pr in 22918 25969 25908 26047 26020 26115 26197; do contrib/backporting/set-labels.py $pr done 1.13; done

[ 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:24
@michi-covalent michi-covalent added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels Jun 13, 2023
@michi-covalent michi-covalent deleted the pr/v1.13-backport-2023-06-13 branch June 13, 2023 22:24
@michi-covalent michi-covalent restored the pr/v1.13-backport-2023-06-13 branch June 13, 2023 22:26
@michi-covalent
Copy link
Contributor Author

sorry for the spam, i meant to only backport #26197. opened #26200 🙏

@michi-covalent michi-covalent deleted the pr/v1.13-backport-2023-06-13 branch June 14, 2023 02:22
@maintainer-s-little-helper
Copy link

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.

@maintainer-s-little-helper
Copy link

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

None yet

2 participants