fix merge conflicts

Author: gondor

config.json

@@ -0,0 +1,46 @@
+{
+    "description": "NFS/EFS/Samba/Ceph plugin for Docker",
+    "documentation": "https://netshare.containx.io",
+    "entrypoint": [
+        "/docker-volume-netshare"
+    ],
+    "env": [
+        {
+            "name": "DEBUG",
+            "settable": [
+                "value"
+            ],
+            "value": "0"
+        }
+    ],
+    "interface": {
+        "socket": "netshare.sock",
+        "types": [
+            "docker.volumedriver/1.0"
+        ]
+    },
+    "linux": {
+        "capabilities": [
+            "CAP_SYS_ADMIN"
+        ],
+        "devices": [
+            {
+                "path": "/dev/fuse"
+            }
+        ]
+    },
+    "mounts": [
+        {
+            "destination": "/mnt/state",
+            "options": [
+                "rbind"
+            ],
+            "source": "/var/lib/docker/plugins/",
+            "type": "bind"
+        }
+    ],
+    "network": {
+        "type": "host"
+    },
+    "propagatedmount": "/mnt/volumes"
+}

netshare/drivers/ceph.go

@@ -23,10 +23,6 @@ type cephDriver struct {
 	cephopts   map[string]string
 }
 
-//var (
-//	EmptyMap = map[string]string{}
-//)
-
 func NewCephDriver(root string, username string, password string, context string, cephmount string, cephport string, localmount string, cephopts string) cephDriver {
 	d := cephDriver{
 		volumeDriver: newVolumeDriver(root),

netshare/drivers/cifs.go

@@ -67,15 +67,29 @@ func (c cifsDriver) Mount(r volume.MountRequest) volume.Response {
 	c.m.Lock()
 	defer c.m.Unlock()
 	hostdir := mountpoint(c.root, r.Name)
-	source := c.fixSource(r.Name, r.ID)
+	source := c.fixSource(r.Name)
 	host := c.parseHost(r.Name)
 
+	resolvedName, resOpts := resolveName(r.Name)
+
 	log.Infof("Mount: %s, ID: %s", r.Name, r.ID)
 
+	// Support adhoc mounts (outside of docker volume create)
+	// need to adjust source for ShareOpt
+	if resOpts != nil {
+		if share, found := resOpts[ShareOpt]; found {
+			source = c.fixSource(share)
+		}
+	}
+
 	if c.mountm.HasMount(r.Name) && c.mountm.Count(r.Name) > 0 {
 		log.Infof("Using existing CIFS volume mount: %s", hostdir)
 		c.mountm.Increment(r.Name)
-		return volume.Response{Mountpoint: hostdir}
+		if err := run(fmt.Sprintf("mountpoint -q %s", hostdir)); err != nil {
+			log.Infof("Existing CIFS volume not mounted, force remount.")
+		} else {
+			return volume.Response{Mountpoint: hostdir}
+		}
 	}
 
 	log.Infof("Mounting CIFS volume %s on %s", source, hostdir)
@@ -88,14 +102,23 @@ func (c cifsDriver) Mount(r volume.MountRequest) volume.Response {
 		return volume.Response{Err: err.Error()}
 	}
 	c.mountm.Add(r.Name, hostdir)
+
+	if c.mountm.GetOption(resolvedName, ShareOpt) != "" && c.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 {
+			return volume.Response{Err: err.Error()}
+		}
+		hostdir = datavol
+	}
 	return volume.Response{Mountpoint: hostdir}
 }
 
 func (c cifsDriver) Unmount(r volume.UnmountRequest) volume.Response {
 	c.m.Lock()
 	defer c.m.Unlock()
 	hostdir := mountpoint(c.root, r.Name)
-	source := c.fixSource(r.Name, r.ID)
+	source := c.fixSource(r.Name)
 
 	if c.mountm.HasMount(r.Name) {
 		if c.mountm.Count(r.Name) > 1 {
@@ -121,7 +144,7 @@ func (c cifsDriver) Unmount(r volume.UnmountRequest) volume.Response {
 	return volume.Response{}
 }
 
-func (c cifsDriver) fixSource(name, id string) string {
+func (c cifsDriver) fixSource(name string) string {
 	if c.mountm.HasOption(name, ShareOpt) {
 		return "//" + c.mountm.GetOption(name, ShareOpt)
 	}

netshare/drivers/mounts.go

@@ -141,7 +141,7 @@ func (m *mountManager) Increment(name string) int {
 
 func (m *mountManager) Decrement(name string) int {
 	c, found := m.mounts[name]
-	if found {
+	if found && c.connections > 0 {
 		c.connections--
 	}
 	return 0

netshare/drivers/nfs.go

@@ -57,9 +57,10 @@ func (n nfsDriver) Mount(r volume.MountRequest) volume.Response {
 	if n.mountm.HasMount(resolvedName) && n.mountm.Count(resolvedName) > 0 {
 		log.Infof("Using existing NFS volume mount: %s", hostdir)
 		n.mountm.Increment(resolvedName)
-		if err := run(fmt.Sprintf("mountpoint -q %s", hostdir)); err != nil {
+		if err := run(fmt.Sprintf("grep -c %s /proc/mounts", hostdir)); err != nil {
 			log.Infof("Existing NFS volume not mounted, force remount.")
 		} else {
+			n.mountm.Increment(resolvedName)
 			return volume.Response{Mountpoint: hostdir}
 		}
 	}
@@ -74,10 +75,11 @@ func (n nfsDriver) Mount(r volume.MountRequest) volume.Response {
 		n.mountm.Create(resolvedName, hostdir, resOpts)
 	}
 
+	n.mountm.Add(resolvedName, hostdir)
+	
 	if err := n.mountVolume(resolvedName, source, hostdir, n.version); err != nil {
 		return volume.Response{Err: err.Error()}
 	}
-	n.mountm.Add(resolvedName, hostdir)
 
 	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)
@@ -119,9 +121,14 @@ func (n nfsDriver) Unmount(r volume.UnmountRequest) volume.Response {
 
 	n.mountm.DeleteIfNotManaged(resolvedName)
 
-	if err := os.RemoveAll(hostdir); err != nil {
-		return volume.Response{Err: err.Error()}
-	}
+        // Check if directory is empty. This command will return "err" if empty
+        if err := run(fmt.Sprintf("ls -1 %s | grep .", hostdir)); err == nil {
+                log.Warnf("Directory %s not empty after unmount. Skipping RemoveAll call.", hostdir)
+        } else {
+                if err := os.RemoveAll(hostdir); err != nil {
+                      return volume.Response{Err: err.Error()}
+		}
+        }
 
 	return volume.Response{}
 }