Skip to content

Commit 9845c11

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1169 from artemvmin/serial-mkfs
Serial mkfs
2 parents 83fab2b + 7f1e04e commit 9845c11

File tree

331 files changed

+75839
-37845
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

331 files changed

+75839
-37845
lines changed

‎cmd/gce-pd-csi-driver/main.go

+11-9
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ var (
5959
waitForOpBackoffSteps = flag.Int("wait-op-backoff-steps", 100, "Steps for wait for operation backoff")
6060
waitForOpBackoffCap = flag.Duration("wait-op-backoff-cap", 0, "Cap for wait for operation backoff")
6161

62-
maxprocs = flag.Int("maxprocs", 1, "GOMAXPROCS override")
62+
maxProcs = flag.Int("maxprocs", 1, "GOMAXPROCS override")
63+
maxConcurrentFormat = flag.Int("max-concurrent-format", 1, "The maximum number of concurrent format exec calls")
64+
concurrentFormatTimeout = flag.Duration("concurrent-format-timeout", 1*time.Minute, "The maximum duration of a format operation before its concurrency token is released")
6365

6466
version string
6567
)
@@ -88,7 +90,7 @@ func main() {
8890
func handle() {
8991
var err error
9092

91-
runtime.GOMAXPROCS(*maxprocs)
93+
runtime.GOMAXPROCS(*maxProcs)
9294
klog.Infof("Sys info: NumCPU: %v MAXPROC: %v", runtime.NumCPU(), runtime.GOMAXPROCS(0))
9395

9496
if version == "" {
@@ -110,16 +112,16 @@ func handle() {
110112
klog.Fatalf("Bad extra volume labels: %v", err.Error())
111113
}
112114

113-
gceDriver := driver.GetGCEDriver()
114-
115-
//Initialize GCE Driver
116115
ctx, cancel := context.WithCancel(context.Background())
117116
defer cancel()
118117

119-
//Initialize identity server
118+
// Initialize driver
119+
gceDriver := driver.GetGCEDriver()
120+
121+
// Initialize identity server
120122
identityServer := driver.NewIdentityServer(gceDriver)
121123

122-
//Initialize requirements for the controller service
124+
// Initialize requirements for the controller service
123125
var controllerServer *driver.GCEControllerServer
124126
if *runControllerService {
125127
cloudProvider, err := gce.CreateCloudProvider(ctx, version, *cloudConfigFilePath, *computeEndpoint)
@@ -133,10 +135,10 @@ func handle() {
133135
klog.Warningf("controller service is disabled but cloud config given - it has no effect")
134136
}
135137

136-
//Initialize requirements for the node service
138+
// Initialize requirements for the node service
137139
var nodeServer *driver.GCENodeServer
138140
if *runNodeService {
139-
mounter, err := mountmanager.NewSafeMounter()
141+
mounter, err := mountmanager.NewSafeMounter(*maxConcurrentFormat, *concurrentFormatTimeout)
140142
if err != nil {
141143
klog.Fatalf("Failed to get safe mounter: %v", err.Error())
142144
}

‎go.mod

+23-52
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,42 @@ module sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
33
go 1.19
44

55
require (
6-
cloud.google.com/go/compute v1.7.0
7-
cloud.google.com/go/kms v1.4.0
6+
cloud.google.com/go/compute/metadata v0.2.3
7+
cloud.google.com/go/kms v1.6.0
88
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.0
99
github.com/container-storage-interface/spec v1.6.0
1010
github.com/google/uuid v1.3.0
1111
github.com/kubernetes-csi/csi-proxy/client v1.1.1
1212
github.com/kubernetes-csi/csi-test/v4 v4.4.0
1313
github.com/onsi/ginkgo/v2 v2.7.1
1414
github.com/onsi/gomega v1.25.0
15-
golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c
16-
golang.org/x/sys v0.4.0
17-
google.golang.org/api v0.86.0
18-
google.golang.org/genproto v0.0.0-20220720214146-176da50484ac
19-
google.golang.org/grpc v1.48.0
20-
google.golang.org/protobuf v1.28.0
15+
golang.org/x/oauth2 v0.5.0
16+
golang.org/x/sys v0.5.0
17+
google.golang.org/api v0.111.0
18+
google.golang.org/genproto v0.0.0-20230223222841-637eb2293923
19+
google.golang.org/grpc v1.53.0
20+
google.golang.org/protobuf v1.28.1
2121
gopkg.in/gcfg.v1 v1.2.3
22+
k8s.io/api v0.24.1
2223
k8s.io/apimachinery v0.24.1
2324
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
2425
k8s.io/cloud-provider v0.24.1
2526
k8s.io/component-base v0.24.1
26-
k8s.io/klog/v2 v2.60.1
27-
k8s.io/kubernetes v1.24.1
28-
k8s.io/mount-utils v0.24.1
29-
k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e
27+
k8s.io/klog/v2 v2.90.1
28+
k8s.io/mount-utils v0.27.0-alpha.3
29+
k8s.io/utils v0.0.0-20230209194617-a36077c30491
3030
sigs.k8s.io/boskos v0.0.0-20220711194915-6cb8a6fb2dd1
3131
)
3232

3333
require (
34-
cloud.google.com/go v0.103.0 // indirect
35-
cloud.google.com/go/iam v0.3.0 // indirect
34+
cloud.google.com/go/compute v1.18.0 // indirect
35+
cloud.google.com/go/iam v0.11.0 // indirect
3636
github.com/Microsoft/go-winio v0.4.17 // indirect
3737
github.com/PuerkitoBio/purell v1.1.1 // indirect
3838
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3939
github.com/beorn7/perks v1.0.1 // indirect
4040
github.com/blang/semver/v4 v4.0.0 // indirect
41-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
41+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4242
github.com/davecgh/go-spew v1.1.1 // indirect
4343
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
4444
github.com/fsnotify/fsnotify v1.5.4 // indirect
@@ -52,15 +52,16 @@ require (
5252
github.com/google/gnostic v0.5.7-v3refs // indirect
5353
github.com/google/go-cmp v0.5.9 // indirect
5454
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
55-
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
56-
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
55+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
56+
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
5757
github.com/hashicorp/errwrap v1.0.0 // indirect
5858
github.com/hashicorp/go-multierror v1.1.0 // indirect
5959
github.com/imdario/mergo v0.3.12 // indirect
6060
github.com/josharian/intern v1.0.0 // indirect
6161
github.com/json-iterator/go v1.1.12 // indirect
6262
github.com/mailru/easyjson v0.7.7 // indirect
6363
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
64+
github.com/moby/sys/mountinfo v0.6.2 // indirect
6465
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6566
github.com/modern-go/reflect2 v1.0.2 // indirect
6667
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -73,53 +74,23 @@ require (
7374
github.com/prometheus/procfs v0.7.3 // indirect
7475
github.com/sirupsen/logrus v1.8.1 // indirect
7576
github.com/spf13/pflag v1.0.5 // indirect
76-
go.opencensus.io v0.23.0 // indirect
77+
go.opencensus.io v0.24.0 // indirect
7778
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
78-
golang.org/x/net v0.5.0 // indirect
79-
golang.org/x/term v0.4.0 // indirect
80-
golang.org/x/text v0.6.0 // indirect
79+
golang.org/x/net v0.7.0 // indirect
80+
golang.org/x/term v0.5.0 // indirect
81+
golang.org/x/text v0.7.0 // indirect
8182
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
8283
google.golang.org/appengine v1.6.7 // indirect
8384
gopkg.in/inf.v0 v0.9.1 // indirect
8485
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8586
gopkg.in/warnings.v0 v0.1.2 // indirect
8687
gopkg.in/yaml.v2 v2.4.0 // indirect
8788
gopkg.in/yaml.v3 v3.0.1 // indirect
88-
k8s.io/api v0.24.1 // indirect
8989
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
9090
k8s.io/test-infra v0.0.0-20210730160938-8ad9b8c53bd8 // indirect
9191
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
9292
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
9393
sigs.k8s.io/yaml v1.3.0 // indirect
9494
)
9595

96-
replace (
97-
k8s.io/api => k8s.io/api v0.24.1
98-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.1
99-
k8s.io/apimachinery => k8s.io/apimachinery v0.24.1
100-
k8s.io/apiserver => k8s.io/apiserver v0.24.1
101-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.1
102-
k8s.io/client-go => k8s.io/client-go v0.24.1
103-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.1
104-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.1
105-
k8s.io/code-generator => k8s.io/code-generator v0.24.1
106-
k8s.io/component-base => k8s.io/component-base v0.24.1
107-
k8s.io/component-helpers => k8s.io/component-helpers v0.24.1
108-
k8s.io/controller-manager => k8s.io/controller-manager v0.24.1
109-
k8s.io/cri-api => k8s.io/cri-api v0.24.1
110-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.1
111-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.1
112-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.1
113-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.1
114-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.1
115-
k8s.io/kubectl => k8s.io/kubectl v0.24.1
116-
k8s.io/kubelet => k8s.io/kubelet v0.24.1
117-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.1
118-
k8s.io/metrics => k8s.io/metrics v0.24.1
119-
k8s.io/mount-utils => k8s.io/mount-utils v0.24.1
120-
k8s.io/node-api => k8s.io/node-api v0.24.1
121-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.1
122-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.1
123-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.1
124-
k8s.io/sample-controller => k8s.io/sample-controller v0.24.1
125-
)
96+
replace k8s.io/client-go => k8s.io/client-go v0.24.1

0 commit comments

Comments
 (0)