debug

qingyang-hu · Feb 16, 2024 · 6c6b4cc · 6c6b4cc
1 parent bf1d085
commit 6c6b4cc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 58 deletions.
diff --git a/Makefile b/Makefile
@@ -158,7 +158,7 @@ evg-test-load-balancers:
 
 .PHONY: evg-test-search-index
 evg-test-search-index:
-	go test ./mongo/integration -run TestSearchIndexProse -v -timeout $(TEST_TIMEOUT)s >> test.suite
+	go test ./mongo/integration -run TestSearchIndexProse -v -timeout $(TEST_TIMEOUT)s
 
 .PHONY: evg-test-ocsp
 evg-test-ocsp:

diff --git a/mongo/integration/search_index_prose_test.go b/mongo/integration/search_index_prose_test.go
@@ -211,21 +211,19 @@ func TestSearchIndexProse(t *testing.T) {
 
 		var doc bson.Raw
 		for doc == nil {
-			for {
-				cursor, err := view.List(ctx, opts)
-				require.NoError(mt, err, "failed to list")
+			cursor, err := view.List(ctx, opts)
+			require.NoError(mt, err, "failed to list")
 
-				if !cursor.Next(ctx) {
-					break
-				}
-				name := cursor.Current.Lookup("name").StringValue()
-				queryable := cursor.Current.Lookup("queryable").Boolean()
-				if name == searchName && queryable {
-					doc = cursor.Current
-				} else {
-					t.Logf("cursor: %s, sleep 5 seconds...", cursor.Current.String())
-					time.Sleep(5 * time.Second)
-				}
+			if !cursor.Next(ctx) {
+				break
+			}
+			name := cursor.Current.Lookup("name").StringValue()
+			queryable := cursor.Current.Lookup("queryable").Boolean()
+			if name == searchName && queryable {
+				doc = cursor.Current
+			} else {
+				t.Logf("cursor: %s, sleep 5 seconds...", cursor.Current.String())
+				time.Sleep(5 * time.Second)
 			}
 		}
 		require.NotNil(mt, doc, "got empty document")
@@ -234,22 +232,20 @@ func TestSearchIndexProse(t *testing.T) {
 		err = view.UpdateOne(ctx, searchName, definition)
 		require.NoError(mt, err, "failed to update index")
 		for doc == nil {
-			for {
-				cursor, err := view.List(ctx, opts)
-				require.NoError(mt, err, "failed to list")
+			cursor, err := view.List(ctx, opts)
+			require.NoError(mt, err, "failed to list")
 
-				if !cursor.Next(ctx) {
-					break
-				}
-				name := cursor.Current.Lookup("name").StringValue()
-				queryable := cursor.Current.Lookup("queryable").Boolean()
-				status := cursor.Current.Lookup("status").StringValue()
-				if name == searchName && queryable && status == "READY" {
-					doc = cursor.Current
-				} else {
-					t.Logf("cursor: %s, sleep 5 seconds...", cursor.Current.String())
-					time.Sleep(5 * time.Second)
-				}
+			if !cursor.Next(ctx) {
+				break
+			}
+			name := cursor.Current.Lookup("name").StringValue()
+			queryable := cursor.Current.Lookup("queryable").Boolean()
+			status := cursor.Current.Lookup("status").StringValue()
+			if name == searchName && queryable && status == "READY" {
+				doc = cursor.Current
+			} else {
+				t.Logf("cursor: %s, sleep 5 seconds...", cursor.Current.String())
+				time.Sleep(5 * time.Second)
 			}
 		}
 		require.NotNil(mt, doc, "got empty document")

diff --git a/mongo/search_index_view.go b/mongo/search_index_view.go
@@ -13,7 +13,6 @@ import (
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"go.mongodb.org/mongo-driver/mongo/writeconcern"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
 	"go.mongodb.org/mongo-driver/x/mongo/driver"
 	"go.mongodb.org/mongo-driver/x/mongo/driver/operation"
@@ -134,18 +133,10 @@ func (siv SearchIndexView) CreateMany(
 		return nil, err
 	}
 
-	wc := siv.coll.writeConcern
-	if sess.TransactionRunning() {
-		wc = nil
-	}
-	if !writeconcern.AckWrite(wc) {
-		sess = nil
-	}
-
 	selector := makePinnedSelector(sess, siv.coll.writeSelector)
 
 	op := operation.NewCreateSearchIndexes(indexes).
-		Session(sess).WriteConcern(wc).ClusterClock(siv.coll.client.clock).
+		Session(sess).ClusterClock(siv.coll.client.clock).
 		Database(siv.coll.db.name).Collection(siv.coll.name).CommandMonitor(siv.coll.client.monitor).
 		Deployment(siv.coll.client.deployment).ServerSelector(selector).ServerAPI(siv.coll.client.serverAPI).
 		Timeout(siv.coll.client.timeout)
@@ -196,18 +187,10 @@ func (siv SearchIndexView) DropOne(
 		return err
 	}
 
-	wc := siv.coll.writeConcern
-	if sess.TransactionRunning() {
-		wc = nil
-	}
-	if !writeconcern.AckWrite(wc) {
-		sess = nil
-	}
-
 	selector := makePinnedSelector(sess, siv.coll.writeSelector)
 
 	op := operation.NewDropSearchIndex(name).
-		Session(sess).WriteConcern(wc).CommandMonitor(siv.coll.client.monitor).
+		Session(sess).CommandMonitor(siv.coll.client.monitor).
 		ServerSelector(selector).ClusterClock(siv.coll.client.clock).
 		Database(siv.coll.db.name).Collection(siv.coll.name).
 		Deployment(siv.coll.client.deployment).ServerAPI(siv.coll.client.serverAPI).
@@ -258,18 +241,10 @@ func (siv SearchIndexView) UpdateOne(
 		return err
 	}
 
-	wc := siv.coll.writeConcern
-	if sess.TransactionRunning() {
-		wc = nil
-	}
-	if !writeconcern.AckWrite(wc) {
-		sess = nil
-	}
-
 	selector := makePinnedSelector(sess, siv.coll.writeSelector)
 
 	op := operation.NewUpdateSearchIndex(name, indexDefinition).
-		Session(sess).WriteConcern(wc).CommandMonitor(siv.coll.client.monitor).
+		Session(sess).CommandMonitor(siv.coll.client.monitor).
 		ServerSelector(selector).ClusterClock(siv.coll.client.clock).
 		Database(siv.coll.db.name).Collection(siv.coll.name).
 		Deployment(siv.coll.client.deployment).ServerAPI(siv.coll.client.serverAPI).