infrastructure/k8s-csi-s3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fix s3ql unmount

Browse source
This commit is contained in:
Cyrill Troxler 2018-07-21 16:36:39 +02:00
parent 8cd8f6b6cd
commit b412e81977
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/s3driver/Dockerfile.s3ql
View file

@ -5,7 +5,7 @@ ARG S3QL_VERSION=release-2.28
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
s3fs wget python3 python3-setuptools \ s3fs wget psmisc python3 python3-setuptools \
python3-dev python3-pip python3-llfuse pkg-config \ python3-dev python3-pip python3-llfuse pkg-config \
sqlite3 libsqlite3-dev python3-apsw cython && \ sqlite3 libsqlite3-dev python3-apsw cython && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

5
pkg/s3/mounter_s3ql.go
View file

@ -80,10 +80,7 @@ func (s3ql *s3qlMounter) Mount(targetPath string) error {
} }
func (s3ql *s3qlMounter) Unmount(targetPath string) error { func (s3ql *s3qlMounter) Unmount(targetPath string) error {
args := []string{ return s3qlCmd(s3qlCmdUnmount, []string{targetPath}, nil)
targetPath,
}
return s3qlCmd(s3qlCmdUnmount, append(args, s3ql.options...), nil)
} }
func s3qlCmd(s3qlCmd string, args []string, stdin io.Reader) error { func s3qlCmd(s3qlCmd string, args []string, stdin io.Reader) error {

4
pkg/s3/nodeserver.go
View file

@ -105,14 +105,14 @@ func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu
if err != nil { if err != nil {
return nil, err return nil, err
} }
mounter.Unmount(req.GetTargetPath()) if err := mounter.Unmount(req.GetTargetPath()); err != nil {
if err != nil {
return nil, status.Error(codes.Internal, err.Error()) return nil, status.Error(codes.Internal, err.Error())
} }
glog.V(4).Infof("s3: bucket %s has been unmounted.", req.GetVolumeId()) glog.V(4).Infof("s3: bucket %s has been unmounted.", req.GetVolumeId())
return &csi.NodeUnpublishVolumeResponse{}, nil return &csi.NodeUnpublishVolumeResponse{}, nil
} }
func (ns *nodeServer) NodeStageVolume( func (ns *nodeServer) NodeStageVolume(
ctx context.Context, ctx context.Context,
req *csi.NodeStageVolumeRequest) ( req *csi.NodeStageVolumeRequest) (

2
test/Dockerfile
View file

@ -5,7 +5,7 @@ ARG S3QL_VERSION=release-2.28
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
s3fs wget python3 python3-setuptools \ s3fs wget psmisc python3 python3-setuptools \
python3-dev python3-pip python3-llfuse pkg-config \ python3-dev python3-pip python3-llfuse pkg-config \
sqlite3 libsqlite3-dev python3-apsw cython && \ sqlite3 libsqlite3-dev python3-apsw cython && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*