Merge pull request #68065 from wojtek-t/fix_unnecessary_too_old_rv_errors
Automatic merge from submit-queue (batch tested with PRs 68051, 68130, 67211, 68065, 68117). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Fix unnecessary too-old-errors from watch cache When initializing watch cache via LIST, we set its resource version to the RV of the list request. However, before this PR, the first incoming watch event (updating the watch cache) was moving the "smallest oldest known version" to RV of that watch event. So watch requests passing rv equal to the RV returned from the initial list were failing with "too old resource version". That is not needed, because we know that in the meantime there weren't any other watch events. This PR is addressing that issue. /assign @liggitt Kubernetes-commit: 3966b8bbcc072cb48508d151c284241a26c45ede
This commit is contained in:
Kubernetes Publisher
commit
0e7eb02c02
|
|
@ -856,343 +856,343 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/admission/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/apps/v1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/apps/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/apps/v1beta2",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/authentication/v1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/authentication/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/authorization/v1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/authorization/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/autoscaling/v1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/autoscaling/v2beta2",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/batch/v1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/batch/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/batch/v2alpha1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/certificates/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/coordination/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/core/v1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/events/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/extensions/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/networking/v1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/policy/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/rbac/v1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/rbac/v1alpha1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/rbac/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/scheduling/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/settings/v1alpha1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/storage/v1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/storage/v1alpha1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api/storage/v1beta1",
|
||||
"Rev": "966002ba0fc391179b1696ae6ec7862071637fa5"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/fields",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/labels",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/selection",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/types",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/version",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/pkg/watch",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
|
||||
"Rev": "7022e8e5e6f8d55cdc303669184073a493482496"
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/discovery",
|
||||
|
|
@ -1202,10 +1202,6 @@
|
|||
"ImportPath": "k8s.io/client-go/discovery/fake",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/informers",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/informers/admissionregistration",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
|
|
@ -1382,10 +1378,6 @@
|
|||
"ImportPath": "k8s.io/client-go/kubernetes",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/kubernetes/fake",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
|
|
@ -1786,10 +1778,6 @@
|
|||
"ImportPath": "k8s.io/client-go/tools/cache",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/tools/clientcmd",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
|
|
@ -1866,6 +1854,74 @@
|
|||
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
|
||||
"Rev": "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/discovery",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/informers",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/kubernetes",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/kubernetes/fake",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/listers/core/v1",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/rest",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/testing",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/tools/cache",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/tools/clientcmd",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/util/cert",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go/util/flowcontrol",
|
||||
"Rev": "87935b98dd4abdf6477f29baf934d6dd0aba82d4"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/utils/pointer",
|
||||
"Rev": "66066c83e385e385ccc3c964b44fd7dcd413d0ed"
|
||||
|
|
|
|||
|
|
@ -127,6 +127,9 @@ type watchCache struct {
|
|||
// ResourceVersion up to which the watchCache is propagated.
|
||||
resourceVersion uint64
|
||||
|
||||
// ResourceVersion of the last list result (populated via Replace() method).
|
||||
listResourceVersion uint64
|
||||
|
||||
// This handler is run at the end of every successful Replace() method.
|
||||
onReplace func()
|
||||
|
||||
|
|
@ -147,16 +150,17 @@ func newWatchCache(
|
|||
getAttrsFunc func(runtime.Object) (labels.Set, fields.Set, bool, error),
|
||||
versioner storage.Versioner) *watchCache {
|
||||
wc := &watchCache{
|
||||
capacity: capacity,
|
||||
keyFunc: keyFunc,
|
||||
getAttrsFunc: getAttrsFunc,
|
||||
cache: make([]watchCacheElement, capacity),
|
||||
startIndex: 0,
|
||||
endIndex: 0,
|
||||
store: cache.NewStore(storeElementKey),
|
||||
resourceVersion: 0,
|
||||
clock: clock.RealClock{},
|
||||
versioner: versioner,
|
||||
capacity: capacity,
|
||||
keyFunc: keyFunc,
|
||||
getAttrsFunc: getAttrsFunc,
|
||||
cache: make([]watchCacheElement, capacity),
|
||||
startIndex: 0,
|
||||
endIndex: 0,
|
||||
store: cache.NewStore(storeElementKey),
|
||||
resourceVersion: 0,
|
||||
listResourceVersion: 0,
|
||||
clock: clock.RealClock{},
|
||||
versioner: versioner,
|
||||
}
|
||||
wc.cond = sync.NewCond(wc.RLocker())
|
||||
return wc
|
||||
|
|
@ -390,6 +394,7 @@ func (w *watchCache) Replace(objs []interface{}, resourceVersion string) error {
|
|||
if err := w.store.Replace(toReplace, resourceVersion); err != nil {
|
||||
return err
|
||||
}
|
||||
w.listResourceVersion = version
|
||||
w.resourceVersion = version
|
||||
if w.onReplace != nil {
|
||||
w.onReplace()
|
||||
|
|
@ -412,12 +417,26 @@ func (w *watchCache) SetOnEvent(onEvent func(*watchCacheEvent)) {
|
|||
|
||||
func (w *watchCache) GetAllEventsSinceThreadUnsafe(resourceVersion uint64) ([]*watchCacheEvent, error) {
|
||||
size := w.endIndex - w.startIndex
|
||||
// if we have no watch events in our cache, the oldest one we can successfully deliver to a watcher
|
||||
// is the *next* event we'll receive, which will be at least one greater than our current resourceVersion
|
||||
oldest := w.resourceVersion + 1
|
||||
if size > 0 {
|
||||
var oldest uint64
|
||||
switch {
|
||||
case size >= w.capacity:
|
||||
// Once the watch event buffer is full, the oldest watch event we can deliver
|
||||
// is the first one in the buffer.
|
||||
oldest = w.cache[w.startIndex%w.capacity].resourceVersion
|
||||
case w.listResourceVersion > 0:
|
||||
// If the watch event buffer isn't full, the oldest watch event we can deliver
|
||||
// is one greater than the resource version of the last full list.
|
||||
oldest = w.listResourceVersion + 1
|
||||
case size > 0:
|
||||
// If we've never completed a list, use the resourceVersion of the oldest event
|
||||
// in the buffer.
|
||||
// This should only happen in unit tests that populate the buffer without
|
||||
// performing list/replace operations.
|
||||
oldest = w.cache[w.startIndex%w.capacity].resourceVersion
|
||||
default:
|
||||
return nil, fmt.Errorf("watch cache isn't correctly initialized")
|
||||
}
|
||||
|
||||
if resourceVersion == 0 {
|
||||
// resourceVersion = 0 means that we don't require any specific starting point
|
||||
// and we would like to start watching from ~now.
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ package cacher
|
|||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
|
|
@ -278,6 +279,41 @@ func TestEvents(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestMarker(t *testing.T) {
|
||||
store := newTestWatchCache(3)
|
||||
|
||||
// First thing that is called when propagated from storage is Replace.
|
||||
store.Replace([]interface{}{
|
||||
makeTestPod("pod1", 5),
|
||||
makeTestPod("pod2", 9),
|
||||
}, "9")
|
||||
|
||||
_, err := store.GetAllEventsSince(8)
|
||||
if err == nil || !strings.Contains(err.Error(), "too old resource version") {
|
||||
t.Errorf("unexpected error: %v", err)
|
||||
}
|
||||
// Getting events from 8 should return no events,
|
||||
// even though there is a marker there.
|
||||
result, err := store.GetAllEventsSince(9)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if len(result) != 0 {
|
||||
t.Errorf("unexpected result: %#v, expected no events", result)
|
||||
}
|
||||
|
||||
pod := makeTestPod("pods", 12)
|
||||
store.Add(pod)
|
||||
// Getting events from 8 should still work and return one event.
|
||||
result, err = store.GetAllEventsSince(9)
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if len(result) != 1 || !apiequality.Semantic.DeepEqual(result[0].Object, pod) {
|
||||
t.Errorf("unexpected result: %#v, expected %v", result, pod)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWaitUntilFreshAndList(t *testing.T) {
|
||||
store := newTestWatchCache(3)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue