Fix iNotifyWatch timeout (#1058)

* Fix issue with iNotify

Start watching BEFORE we send attach request to the server ,to prevent a race when linux discovers new device before we start watching for it.

vmdk_plugin/drivers/vmdk/vmdk_driver.go

@@ -246,6 +246,8 @@ func (d *VolumeDriver) Create(r volume.Request) volume.Response {
 	log.WithFields(log.Fields{"name": r.Name,
 		"fstype": r.Options["fstype"]}).Info("Attaching volume and creating filesystem ")
 
+	watcher, skipInotify := fs.DevAttachWaitPrep(r.Name, watchPath)
+
 	dev, errAttach := d.ops.Attach(r.Name, nil)
 	if errAttach != nil {
 		log.WithFields(log.Fields{"name": r.Name,
@@ -260,8 +262,6 @@ func (d *VolumeDriver) Create(r volume.Request) volume.Response {
 		return volume.Response{Err: errAttach.Error()}
 	}
 
-	watcher, skipInotify := fs.DevAttachWaitPrep(r.Name, watchPath)
-
 	device, errGetDevicePath := fs.GetDevicePath(dev)
 	if errGetDevicePath != nil {
 		log.WithFields(log.Fields{"name": r.Name,

vmdk_plugin/utils/fs/fs.go

@@ -39,7 +39,7 @@ const (
 	pciAddrLen      = 10                       // Length of PCI dev addr
 	diskPathByDevID = "/dev/disk/by-id/wwn-0x" // Path for devices named by ID
 	scsiHostPath    = "/sys/class/scsi_host/"  // Path for scsi hosts
-	devWaitTimeout  = 1 * time.Second          // give it plenty of time to sense the attached disk
+	devWaitTimeout  = 10 * time.Second         // give it plenty of time to sense the attached disk
 	bdevPath        = "/sys/block/"
 	deleteFile      = "/device/delete"
 	watchPath       = "/dev/disk/by-id"