mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-04 01:40:07 +00:00
cacher: returns an error when watch list was requested and storage.RequestWatchProgress is disabled
This commit is contained in:
parent
fb7bbd2e5d
commit
cb8cbc60a1
@ -578,6 +578,12 @@ func (c *Cacher) Watch(ctx context.Context, key string, opts storage.ListOptions
|
|||||||
// watchers on our watcher having a processing hiccup
|
// watchers on our watcher having a processing hiccup
|
||||||
chanSize := c.watchCache.suggestedWatchChannelSize(c.indexedTrigger != nil, triggerSupported)
|
chanSize := c.watchCache.suggestedWatchChannelSize(c.indexedTrigger != nil, triggerSupported)
|
||||||
|
|
||||||
|
// client-go is going to fall back to a standard LIST on any error
|
||||||
|
// returned for watch-list requests
|
||||||
|
if isListWatchRequest(opts) && !etcdfeature.DefaultFeatureSupportChecker.Supports(storage.RequestWatchProgress) {
|
||||||
|
return newErrWatcher(fmt.Errorf("a watch stream was requested by the client but the required storage feature %s is disabled", storage.RequestWatchProgress)), nil
|
||||||
|
}
|
||||||
|
|
||||||
// Determine the ResourceVersion to which the watch cache must be synchronized
|
// Determine the ResourceVersion to which the watch cache must be synchronized
|
||||||
requiredResourceVersion, err := c.getWatchCacheResourceVersion(ctx, requestedWatchRV, opts)
|
requiredResourceVersion, err := c.getWatchCacheResourceVersion(ctx, requestedWatchRV, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -1296,7 +1302,7 @@ func (c *Cacher) LastSyncResourceVersion() (uint64, error) {
|
|||||||
//
|
//
|
||||||
// The returned function must be called under the watchCache lock.
|
// The returned function must be called under the watchCache lock.
|
||||||
func (c *Cacher) getBookmarkAfterResourceVersionLockedFunc(parsedResourceVersion, requiredResourceVersion uint64, opts storage.ListOptions) (func() uint64, error) {
|
func (c *Cacher) getBookmarkAfterResourceVersionLockedFunc(parsedResourceVersion, requiredResourceVersion uint64, opts storage.ListOptions) (func() uint64, error) {
|
||||||
if opts.SendInitialEvents == nil || !*opts.SendInitialEvents || !opts.Predicate.AllowWatchBookmarks {
|
if !isListWatchRequest(opts) {
|
||||||
return func() uint64 { return 0 }, nil
|
return func() uint64 { return 0 }, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1311,6 +1317,10 @@ func (c *Cacher) getBookmarkAfterResourceVersionLockedFunc(parsedResourceVersion
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func isListWatchRequest(opts storage.ListOptions) bool {
|
||||||
|
return opts.SendInitialEvents != nil && *opts.SendInitialEvents && opts.Predicate.AllowWatchBookmarks
|
||||||
|
}
|
||||||
|
|
||||||
// getWatchCacheResourceVersion returns a ResourceVersion to which the watch cache must be synchronized to
|
// getWatchCacheResourceVersion returns a ResourceVersion to which the watch cache must be synchronized to
|
||||||
//
|
//
|
||||||
// Depending on the input parameters, the semantics of the returned ResourceVersion are:
|
// Depending on the input parameters, the semantics of the returned ResourceVersion are:
|
||||||
|
Loading…
Reference in New Issue
Block a user