Commit b412e819 authored Jul 21, 2018 by Cyrill Troxler

Fix s3ql unmount

parent 8cd8f6b6

cmd/s3driver/Dockerfile.s3ql

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ ARG S3QL_VERSION=release-2.28

		RUN apt-get update && \
		apt-get install -y \
		s3fs wget python3 python3-setuptools \
		s3fs wget psmisc python3 python3-setuptools \
		python3-dev python3-pip python3-llfuse pkg-config \
		sqlite3 libsqlite3-dev python3-apsw cython && \
		rm -rf /var/lib/apt/lists/*

pkg/s3/mounter_s3ql.go

+1 −4

Original line number	Diff line number	Diff line
		@@ -80,10 +80,7 @@ func (s3ql *s3qlMounter) Mount(targetPath string) error {
		}

		func (s3ql *s3qlMounter) Unmount(targetPath string) error {
		args := []string{
		targetPath,
		}
		return s3qlCmd(s3qlCmdUnmount, append(args, s3ql.options...), nil)
		return s3qlCmd(s3qlCmdUnmount, []string{targetPath}, nil)
		}

		func s3qlCmd(s3qlCmd string, args []string, stdin io.Reader) error {

pkg/s3/nodeserver.go

+2 −2

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

		return &csi.NodeUnpublishVolumeResponse{}, nil
		}

		func (ns *nodeServer) NodeStageVolume(
		ctx context.Context,
		req *csi.NodeStageVolumeRequest) (

test/Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ ARG S3QL_VERSION=release-2.28

		RUN apt-get update && \
		apt-get install -y \
		s3fs wget python3 python3-setuptools \
		s3fs wget psmisc python3 python3-setuptools \
		python3-dev python3-pip python3-llfuse pkg-config \
		sqlite3 libsqlite3-dev python3-apsw cython && \
		rm -rf /var/lib/apt/lists/*