From 1fe218a568aac1b1be317a796a4d3fa93217570d Mon Sep 17 00:00:00 2001 From: Cyrill Troxler Date: Thu, 26 Jul 2018 20:13:40 +0200 Subject: [PATCH] Format using nodeserver, not controller --- pkg/s3/controllerserver.go | 8 -------- pkg/s3/nodeserver.go | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkg/s3/controllerserver.go b/pkg/s3/controllerserver.go index f186bf1..98da7ca 100644 --- a/pkg/s3/controllerserver.go +++ b/pkg/s3/controllerserver.go @@ -61,14 +61,6 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol } } - mounter, err := newMounter(volumeID, cs.s3.cfg) - if err != nil { - return nil, err - } - if err := mounter.Format(); err != nil { - return nil, err - } - glog.V(4).Infof("create volume %s", volumeID) s3Vol := s3Volume{} s3Vol.VolName = req.GetName() diff --git a/pkg/s3/nodeserver.go b/pkg/s3/nodeserver.go index c6dad2e..6e5fae8 100644 --- a/pkg/s3/nodeserver.go +++ b/pkg/s3/nodeserver.go @@ -82,6 +82,9 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis if err != nil { return nil, err } + if err := mounter.Format(); err != nil { + return nil, err + } if err := mounter.Mount(targetPath); err != nil { return nil, err }