Merge pull request #1 from jakirpatel/development

Fixed the bug with mount error.

Author: jakirpatel

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/ContainX/docker-volume-netshare/netshare"
+	"github.com/jakirpatel/docker-volume-netshare/netshare"
 )
 
 var VERSION string = ""

netshare/drivers/nfs.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/volume"
+	log "github.com/sirupsen/logrus"
 )
 
 const (
@@ -55,13 +55,15 @@ func (n nfsDriver) Mount(r *volume.MountRequest) (*volume.MountResponse, error)
 		}
 	}
 
-	if n.mountm.HasMount(resolvedName) && n.mountm.Count(resolvedName) > 0 {
+	if n.mountm.HasMount(resolvedName) {
 		log.Infof("Using existing NFS volume mount: %s", hostdir)
 		n.mountm.Increment(resolvedName)
 		if err := run(fmt.Sprintf("grep -c %s /proc/mounts", hostdir)); err != nil {
 			log.Infof("Existing NFS volume not mounted, force remount.")
 			// maintain count
-			n.mountm.Decrement(resolvedName)
+			if n.mountm.Count(resolvedName) > 0 {
+				n.mountm.Decrement(resolvedName)
+			}
 		} else {
 			//n.mountm.Increment(resolvedName)
 			return &volume.MountResponse{Mountpoint: hostdir}, nil
@@ -71,6 +73,9 @@ func (n nfsDriver) Mount(r *volume.MountRequest) (*volume.MountResponse, error)
 	log.Infof("Mounting NFS volume %s on %s", source, hostdir)
 
 	if err := createDest(hostdir); err != nil {
+		if n.mountm.Count(resolvedName) > 0 {
+			n.mountm.Decrement(resolvedName)
+		}
 		return nil, err
 	}
 
@@ -81,13 +86,15 @@ func (n nfsDriver) Mount(r *volume.MountRequest) (*volume.MountResponse, error)
 	n.mountm.Add(resolvedName, hostdir)
 
 	if err := n.mountVolume(resolvedName, source, hostdir, n.version); err != nil {
+		n.mountm.Decrement(resolvedName)
 		return nil, err
 	}
 
 	if n.mountm.GetOption(resolvedName, ShareOpt) != "" && n.mountm.GetOptionAsBool(resolvedName, CreateOpt) {
 		log.Infof("Mount: Share and Create options enabled - using %s as sub-dir mount", resolvedName)
 		datavol := filepath.Join(hostdir, resolvedName)
 		if err := createDest(filepath.Join(hostdir, resolvedName)); err != nil {
+			n.mountm.Decrement(resolvedName)
 			return nil, err
 		}
 		hostdir = datavol

netshare/netshare.go

@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"context"
 
-	"github.com/ContainX/docker-volume-netshare/netshare/drivers"
+	"github.com/jakirpatel/docker-volume-netshare/netshare/drivers"
 	log "github.com/sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/volume"
 	"github.com/spf13/cobra"