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

Send watch bookmarks every minute #90560

Merged
merged 1 commit into from
May 1, 2020
Merged

Send watch bookmarks every minute #90560

merged 1 commit into from
May 1, 2020

Conversation

wojtek-t
Copy link
Member

Second attempt (after I reverted #90249)

Fix #90160

Try to send watch bookmarks (if requested) periodically in addition to sending them right before timeout

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 28, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wojtek-t

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 28, 2020
@wojtek-t wojtek-t added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. kind/feature Categorizes issue or PR as related to a new feature. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Apr 28, 2020
@wojtek-t wojtek-t force-pushed the frequent_bookmarks branch 2 times, most recently from 3150298 to 0938445 Compare April 28, 2020 17:51
@wojtek-t
Copy link
Member Author

/retest

3 similar comments
@jpbetz
Copy link
Contributor

jpbetz commented Apr 28, 2020

/retest

@answer1991
Copy link
Contributor

/retest

@answer1991
Copy link
Contributor

/retest

mm4tt
mm4tt reviewed Apr 29, 2020
View reviewed changes
staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go Outdated
@@ -848,6 +853,8 @@ func (c *Cacher) dispatchEvent(event *watchCacheEvent) {
if event.Type == watch.Bookmark {
for _, watcher := range c.watchersBuffer {
watcher.nonblockingAdd(event)
// Requeue the watcher for the next bookmark.
c.bookmarkWatchers.addWatcher(watcher)
Copy link
Contributor

Choose a reason for hiding this comment

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

Wouldn't be cleaner to do it in line 924 and update the comment there?

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@mm4tt
Copy link
Contributor

mm4tt commented Apr 29, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 29, 2020
@wojtek-t
Copy link
Member Author

/retest

1 similar comment
@wojtek-t
Copy link
Member Author

/retest

@spiffxp
Copy link
Member

spiffxp commented Apr 30, 2020

/test pull-kubernetes-files-remake

@k8s-ci-robot k8s-ci-robot merged commit 3546d62 into kubernetes:master May 1, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone May 1, 2020
This was referenced May 4, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mm4tt mm4tt mm4tt left review comments

@mml mml Awaiting requested review from mml

@xiang90 xiang90 Awaiting requested review from xiang90

Assignees

@jpbetz jpbetz

@mm4tt mm4tt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

Adjust watch bookmark policy to match watch-cache size policy
6 participants
@wojtek-t @k8s-ci-robot @jpbetz @answer1991 @mm4tt @spiffxp