diff options
| author | chrislu <chris.lu@gmail.com> | 2021-12-28 18:27:16 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2021-12-28 18:27:16 -0800 |
| commit | 2095ddcf9b6ce65125281071ae572dd1d5f2e53f (patch) | |
| tree | c90cb1cba72d253f4412d0b94eee51e1040dee93 | |
| parent | 5820165dae963df6bb905d3ffd531b1ccb3ad26b (diff) | |
| download | seaweedfs-csi-driver-2095ddcf9b6ce65125281071ae572dd1d5f2e53f.tar.xz seaweedfs-csi-driver-2095ddcf9b6ce65125281071ae572dd1d5f2e53f.zip | |
upgrade to latest seaweedfs version
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | pkg/driver/driver.go | 4 |
4 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,4 @@ +# VERSION=latest make push .PHONY: build container clean REGISTRY_NAME=chrislusf @@ -13,8 +14,6 @@ container: build docker build -t $(IMAGE_TAG) -f cmd/seaweedfs-csi-driver/Dockerfile.dev . push: container docker push $(IMAGE_TAG) -release: container - VERSION=latest docker push $(IMAGE_TAG) clean: go clean -r -x -rm -rf _output @@ -3,7 +3,7 @@ module github.com/seaweedfs/seaweedfs-csi-driver go 1.17 require ( - github.com/chrislusf/seaweedfs v0.0.0-20211225090134-c935b9669e6b + github.com/chrislusf/seaweedfs v0.0.0-20211229014101-498661e3bb6f github.com/container-storage-interface/spec v1.5.0 github.com/mitchellh/go-ps v1.0.0 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d @@ -77,6 +77,8 @@ github.com/chrislusf/seaweedfs v0.0.0-20211110202745-b0b2a03ea726 h1:v9nhFqEZc21 github.com/chrislusf/seaweedfs v0.0.0-20211110202745-b0b2a03ea726/go.mod h1:8zovCx9OYusQAK7lHAcVFtQsKO2XVQHHvPdlWbK1VRQ= github.com/chrislusf/seaweedfs v0.0.0-20211225090134-c935b9669e6b h1:fSKTTIh4AxShruTdQ7sfTmPpU9xVogomyUx2UK/+hRY= github.com/chrislusf/seaweedfs v0.0.0-20211225090134-c935b9669e6b/go.mod h1:gULpUj0SQGSA0HZ1tY8TBGU8A2uFLcptDtjWDQrelKA= +github.com/chrislusf/seaweedfs v0.0.0-20211229014101-498661e3bb6f h1:6E9fpSbSPm1OUeBPc2g9Iv+HqyizuRGbmWcQITeZyLM= +github.com/chrislusf/seaweedfs v0.0.0-20211229014101-498661e3bb6f/go.mod h1:gULpUj0SQGSA0HZ1tY8TBGU8A2uFLcptDtjWDQrelKA= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go index 0286a92..061a269 100644 --- a/pkg/driver/driver.go +++ b/pkg/driver/driver.go @@ -128,7 +128,7 @@ func (d *SeaweedFsDriver) ValidateControllerServiceRequest(c csi.ControllerServi var _ = filer_pb.FilerClient(&SeaweedFsDriver{}) -func (d *SeaweedFsDriver) WithFilerClient(fn func(filer_pb.SeaweedFilerClient) error) error { +func (d *SeaweedFsDriver) WithFilerClient(streamingMode bool, fn func(filer_pb.SeaweedFilerClient) error) error { return util.Retry("filer grpc", func() error { @@ -137,7 +137,7 @@ func (d *SeaweedFsDriver) WithFilerClient(fn func(filer_pb.SeaweedFilerClient) e var err error for x := 0; x < n; x++ { - err = pb.WithCachedGrpcClient(func(grpcConnection *grpc.ClientConn) error { + err = pb.WithGrpcClient(streamingMode, func(grpcConnection *grpc.ClientConn) error { client := filer_pb.NewSeaweedFilerClient(grpcConnection) return fn(client) }, d.filers[i].ToGrpcAddress(), d.grpcDialOption) |
