probeAttachedVolume improvement in Cinder

Author: edisonxiang

pkg/volume/cinder/attacher.go

@@ -44,7 +44,7 @@ var _ volume.Attacher = &cinderDiskAttacher{}
 var _ volume.AttachableVolumePlugin = &cinderPlugin{}
 
 const (
-	checkSleepDuration       = 1 * time.Second
+	checkSleepDuration       = 5 * time.Second
 	operationFinishInitDealy = 1 * time.Second
 	operationFinishFactor    = 1.1
 	operationFinishSteps     = 10

pkg/volume/cinder/cinder_util.go

@@ -224,6 +224,18 @@ func probeAttachedVolume() error {
 	scsiHostRescan()
 
 	executor := exec.New()
+
+        // udevadm settle waits for udevd to process the device creation
+        // events for all hardware devices, thus ensuring that any device
+        // nodes have been created successfully before proceeding.
+	argsSettle := []string{"settle", "--timeout=1"}
+	cmdSettle := executor.Command("udevadm", argsSettle...)
+	_, errSettle := cmdSettle.CombinedOutput()
+	if errSettle != nil {
+		glog.Errorf("error running udevadm settle %v\n", errSettle)
+		return errSettle
+	}
+
 	args := []string{"trigger"}
 	cmd := executor.Command("udevadm", args...)
 	_, err := cmd.CombinedOutput()