UPSTREAM: 62827: fix csi data race in csi_attacher_test.go

xref : openshift/origin#19465

Origin-commit: f320c6dae53c0b459ef8420654baf66cbe8eb63a

Author: gnufied

pkg/volume/csi/csi_attacher_test.go

@@ -165,39 +165,26 @@ func TestAttacherAttach(t *testing.T) {
 }
 
 func TestAttacherWaitForVolumeAttachment(t *testing.T) {
-
-	plug, fakeWatcher, tmpDir := newTestWatchPlugin(t)
-	defer os.RemoveAll(tmpDir)
-
-	attacher, err := plug.NewAttacher()
-	if err != nil {
-		t.Fatalf("failed to create new attacher: %v", err)
-	}
-	csiAttacher := attacher.(*csiAttacher)
 	nodeName := "test-node"
-
 	testCases := []struct {
 		name                 string
 		initAttached         bool
 		finalAttached        bool
 		trigerWatchEventTime time.Duration
 		initAttachErr        *storage.VolumeError
 		finalAttachErr       *storage.VolumeError
-		sleepTime            time.Duration
 		timeout              time.Duration
 		shouldFail           bool
 	}{
 		{
 			name:         "attach success at get",
 			initAttached: true,
-			sleepTime:    10 * time.Millisecond,
 			timeout:      50 * time.Millisecond,
 			shouldFail:   false,
 		},
 		{
 			name:          "attachment error ant get",
 			initAttachErr: &storage.VolumeError{Message: "missing volume"},
-			sleepTime:     10 * time.Millisecond,
 			timeout:       30 * time.Millisecond,
 			shouldFail:    true,
 		},
@@ -207,7 +194,6 @@ func TestAttacherWaitForVolumeAttachment(t *testing.T) {
 			finalAttached:        true,
 			trigerWatchEventTime: 5 * time.Millisecond,
 			timeout:              50 * time.Millisecond,
-			sleepTime:            5 * time.Millisecond,
 			shouldFail:           false,
 		},
 		{
@@ -216,7 +202,6 @@ func TestAttacherWaitForVolumeAttachment(t *testing.T) {
 			finalAttached:        false,
 			finalAttachErr:       &storage.VolumeError{Message: "missing volume"},
 			trigerWatchEventTime: 5 * time.Millisecond,
-			sleepTime:            10 * time.Millisecond,
 			timeout:              30 * time.Millisecond,
 			shouldFail:           true,
 		},
@@ -226,32 +211,41 @@ func TestAttacherWaitForVolumeAttachment(t *testing.T) {
 			finalAttached:        true,
 			trigerWatchEventTime: 100 * time.Millisecond,
 			timeout:              50 * time.Millisecond,
-			sleepTime:            5 * time.Millisecond,
 			shouldFail:           true,
 		},
 	}
 
 	for i, tc := range testCases {
-		fakeWatcher.Reset()
+		plug, fakeWatcher, tmpDir := newTestWatchPlugin(t)
+		defer os.RemoveAll(tmpDir)
+
+		attacher, err := plug.NewAttacher()
+		if err != nil {
+			t.Fatalf("failed to create new attacher: %v", err)
+		}
+		csiAttacher := attacher.(*csiAttacher)
 		t.Logf("running test: %v", tc.name)
 		pvName := fmt.Sprintf("test-pv-%d", i)
 		volID := fmt.Sprintf("test-vol-%d", i)
 		attachID := getAttachmentName(volID, testDriver, nodeName)
 		attachment := makeTestAttachment(attachID, nodeName, pvName)
 		attachment.Status.Attached = tc.initAttached
 		attachment.Status.AttachError = tc.initAttachErr
-		csiAttacher.waitSleepTime = tc.sleepTime
-		_, err := csiAttacher.k8s.StorageV1beta1().VolumeAttachments().Create(attachment)
+		_, err = csiAttacher.k8s.StorageV1beta1().VolumeAttachments().Create(attachment)
 		if err != nil {
 			t.Fatalf("failed to attach: %v", err)
 		}
 
+		trigerWatchEventTime := tc.trigerWatchEventTime
+		finalAttached := tc.finalAttached
+		finalAttachErr := tc.finalAttachErr
 		// after timeout, fakeWatcher will be closed by csiAttacher.waitForVolumeAttachment
 		if tc.trigerWatchEventTime > 0 && tc.trigerWatchEventTime < tc.timeout {
 			go func() {
-				time.Sleep(tc.trigerWatchEventTime)
-				attachment.Status.Attached = tc.finalAttached
-				attachment.Status.AttachError = tc.finalAttachErr
+				time.Sleep(trigerWatchEventTime)
+				attachment := makeTestAttachment(attachID, nodeName, pvName)
+				attachment.Status.Attached = finalAttached
+				attachment.Status.AttachError = finalAttachErr
 				fakeWatcher.Modify(attachment)
 			}()
 		}
@@ -677,14 +671,14 @@ func TestAttacherUnmountDevice(t *testing.T) {
 }
 
 // create a plugin mgr to load plugins and setup a fake client
-func newTestWatchPlugin(t *testing.T) (*csiPlugin, *watch.FakeWatcher, string) {
+func newTestWatchPlugin(t *testing.T) (*csiPlugin, *watch.RaceFreeFakeWatcher, string) {
 	tmpDir, err := utiltesting.MkTmpdir("csi-test")
 	if err != nil {
 		t.Fatalf("can't create temp dir: %v", err)
 	}
 
 	fakeClient := fakeclient.NewSimpleClientset()
-	fakeWatcher := watch.NewFake()
+	fakeWatcher := watch.NewRaceFreeFake()
 	fakeClient.Fake.PrependWatchReactor("*", core.DefaultWatchReactor(fakeWatcher, nil))
 	fakeClient.Fake.WatchReactionChain = fakeClient.Fake.WatchReactionChain[:1]
 	host := volumetest.NewFakeVolumeHost(