From b5dfa49e32324f595e9419e6ce7e3699aee49832 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Thu, 21 Feb 2019 07:06:56 -0700 Subject: [PATCH 1/2] update k8s.io/utils to fix keymutex issues --- Godeps/Godeps.json | 26 +++++++++++++------------- vendor/k8s.io/utils/keymutex/hashed.go | 8 ++++---- vendor/k8s.io/utils/nsenter/OWNERS | 2 ++ vendor/k8s.io/utils/pointer/OWNERS | 1 + 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index eaa363d6530..2a6bd248ba2 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -4196,55 +4196,55 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/clock", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/exec", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/exec/testing", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/io", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/keymutex", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/net", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/nsenter", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/path", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/pointer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/strings", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/kustomize/pkg/commands/build", diff --git a/vendor/k8s.io/utils/keymutex/hashed.go b/vendor/k8s.io/utils/keymutex/hashed.go index 54e28b0090a..4ddb00867ff 100644 --- a/vendor/k8s.io/utils/keymutex/hashed.go +++ b/vendor/k8s.io/utils/keymutex/hashed.go @@ -42,17 +42,17 @@ type hashedKeyMutex struct { // Acquires a lock associated with the specified ID. func (km *hashedKeyMutex) LockKey(id string) { - km.mutexes[km.hash(id)%len(km.mutexes)].Lock() + km.mutexes[km.hash(id)%uint32(len(km.mutexes))].Lock() } // Releases the lock associated with the specified ID. func (km *hashedKeyMutex) UnlockKey(id string) error { - km.mutexes[km.hash(id)%len(km.mutexes)].Unlock() + km.mutexes[km.hash(id)%uint32(len(km.mutexes))].Unlock() return nil } -func (km *hashedKeyMutex) hash(id string) int { +func (km *hashedKeyMutex) hash(id string) uint32 { h := fnv.New32a() h.Write([]byte(id)) - return int(h.Sum32()) + return h.Sum32() } diff --git a/vendor/k8s.io/utils/nsenter/OWNERS b/vendor/k8s.io/utils/nsenter/OWNERS index c4f27cb4381..46895cbda83 100644 --- a/vendor/k8s.io/utils/nsenter/OWNERS +++ b/vendor/k8s.io/utils/nsenter/OWNERS @@ -1,3 +1,5 @@ +# See the OWNERS docs at https://go.k8s.io/owners + reviewers: - jsafrane - msau42 diff --git a/vendor/k8s.io/utils/pointer/OWNERS b/vendor/k8s.io/utils/pointer/OWNERS index 2f328f4c905..0d6392752af 100644 --- a/vendor/k8s.io/utils/pointer/OWNERS +++ b/vendor/k8s.io/utils/pointer/OWNERS @@ -1,4 +1,5 @@ # See the OWNERS docs at https://go.k8s.io/owners + approvers: - apelisse - stewart-yu From b9ef1dd50b8db18fa3a2558289caa4e75f116260 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Fri, 22 Feb 2019 10:30:38 +0800 Subject: [PATCH 2/2] Update k/utils dependency in staging --- .../src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json | 6 +++--- staging/src/k8s.io/apiserver/Godeps/Godeps.json | 8 ++++---- staging/src/k8s.io/cli-runtime/Godeps/Godeps.json | 2 +- staging/src/k8s.io/client-go/Godeps/Godeps.json | 6 +++--- staging/src/k8s.io/cloud-provider/Godeps/Godeps.json | 8 ++++---- staging/src/k8s.io/component-base/Godeps/Godeps.json | 2 +- staging/src/k8s.io/csi-api/Godeps/Godeps.json | 6 +++--- staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json | 6 +++--- .../src/k8s.io/kube-controller-manager/Godeps/Godeps.json | 2 +- staging/src/k8s.io/kube-proxy/Godeps/Godeps.json | 2 +- staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json | 2 +- staging/src/k8s.io/metrics/Godeps/Godeps.json | 2 +- staging/src/k8s.io/node-api/Godeps/Godeps.json | 6 +++--- staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json | 6 +++--- staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json | 2 +- staging/src/k8s.io/sample-controller/Godeps/Godeps.json | 6 +++--- 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index b47316ffb1d..8ba77e06f4e 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -2552,15 +2552,15 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath", diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index 3465082ec24..154d003b1a0 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -2052,19 +2052,19 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/pointer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath", diff --git a/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json b/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json index 273be20f3e9..11cae02162a 100644 --- a/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json +++ b/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json @@ -700,7 +700,7 @@ }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/kustomize/pkg/commands/build", diff --git a/staging/src/k8s.io/client-go/Godeps/Godeps.json b/staging/src/k8s.io/client-go/Godeps/Godeps.json index fdf30732d64..aceb54e9d05 100644 --- a/staging/src/k8s.io/client-go/Godeps/Godeps.json +++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json @@ -616,15 +616,15 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json b/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json index 6d87d53f44d..61d7f622f2a 100644 --- a/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json +++ b/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json @@ -964,19 +964,19 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/net", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/component-base/Godeps/Godeps.json b/staging/src/k8s.io/component-base/Godeps/Godeps.json index 30dabce53ad..c013224172e 100644 --- a/staging/src/k8s.io/component-base/Godeps/Godeps.json +++ b/staging/src/k8s.io/component-base/Godeps/Godeps.json @@ -152,7 +152,7 @@ }, { "ImportPath": "k8s.io/utils/pointer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" } ] } diff --git a/staging/src/k8s.io/csi-api/Godeps/Godeps.json b/staging/src/k8s.io/csi-api/Godeps/Godeps.json index 57a482d1e56..c37fdaebf21 100644 --- a/staging/src/k8s.io/csi-api/Godeps/Godeps.json +++ b/staging/src/k8s.io/csi-api/Godeps/Godeps.json @@ -532,15 +532,15 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index 26819c2fab6..a556047bb22 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -1808,15 +1808,15 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath", diff --git a/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json b/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json index 6be6fb20f1b..0091a565179 100644 --- a/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json @@ -152,7 +152,7 @@ }, { "ImportPath": "k8s.io/utils/pointer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" } ] } diff --git a/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json b/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json index 0646f99f054..fbf6a6cd9b2 100644 --- a/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json @@ -152,7 +152,7 @@ }, { "ImportPath": "k8s.io/utils/pointer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" } ] } diff --git a/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json b/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json index d94682be86a..f20c4841c6c 100644 --- a/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json @@ -152,7 +152,7 @@ }, { "ImportPath": "k8s.io/utils/pointer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" } ] } diff --git a/staging/src/k8s.io/metrics/Godeps/Godeps.json b/staging/src/k8s.io/metrics/Godeps/Godeps.json index cc62d77952e..da6469a99e4 100644 --- a/staging/src/k8s.io/metrics/Godeps/Godeps.json +++ b/staging/src/k8s.io/metrics/Godeps/Godeps.json @@ -508,7 +508,7 @@ }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/node-api/Godeps/Godeps.json b/staging/src/k8s.io/node-api/Godeps/Godeps.json index 4d0c38d895f..0a24540f55d 100644 --- a/staging/src/k8s.io/node-api/Godeps/Godeps.json +++ b/staging/src/k8s.io/node-api/Godeps/Godeps.json @@ -532,15 +532,15 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index 81021ee6790..1750fb7ce50 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -1760,15 +1760,15 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/fieldpath", diff --git a/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json b/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json index 26d6136cdbd..12d5310cac7 100644 --- a/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json @@ -580,7 +580,7 @@ }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json index f8a76711707..d4506515040 100644 --- a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json @@ -1140,15 +1140,15 @@ }, { "ImportPath": "k8s.io/utils/buffer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/integer", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "k8s.io/utils/trace", - "Rev": "ed37f7428a91fc2a81070808937195dcd46d320e" + "Rev": "c2654d5206da6b7b6ace12841e8f359bb89b443c" }, { "ImportPath": "sigs.k8s.io/yaml",