PYTHON-2360 Ensure ConnectionCreatedEvents are emitted before ConnectionReadyEvents (#493)

ShaneHarvey · web-flow · commit 337a08c43d83 · 2020-10-06T11:37:27.000-07:00
Connections created in the background (for minPoolSize) are authenticated.
diff --git a/pymongo/pool.py b/pymongo/pool.py
@@ -1193,6 +1193,12 @@ def connect(self, all_credentials=None):
             sock_info.ismaster(all_credentials)
             self.is_writable = sock_info.is_writable
 
+        try:
+            sock_info.check_auth(all_credentials)
+        except Exception:
+            sock_info.close_socket(ConnectionClosedReason.ERROR)
+            raise
+
         return sock_info
 
     @contextlib.contextmanager
diff --git a/test/cmap/connection-must-have-id.json b/test/cmap/connection-must-have-id.json
@@ -12,26 +12,32 @@
   ],
   "events": [
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
     },
     {
       "type": "ConnectionCreated",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
     },
     {
       "type": "ConnectionCreated",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/connection-must-order-ids.json b/test/cmap/connection-must-order-ids.json
@@ -12,26 +12,32 @@
   ],
   "events": [
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
     },
     {
       "type": "ConnectionCreated",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
     },
     {
       "type": "ConnectionCreated",
-      "connectionId": 2
+      "connectionId": 2,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 2
+      "connectionId": 2,
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/pool-checkin-destroy-closed.json b/test/cmap/pool-checkin-destroy-closed.json
@@ -18,20 +18,23 @@
   "events": [
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionPoolClosed",
       "address": 42
     },
     {
       "type": "ConnectionCheckedIn",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionClosed",
       "connectionId": 1,
-      "reason": "poolClosed"
+      "reason": "poolClosed",
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/pool-checkin-destroy-stale.json b/test/cmap/pool-checkin-destroy-stale.json
@@ -18,20 +18,23 @@
   "events": [
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionPoolCleared",
       "address": 42
     },
     {
       "type": "ConnectionCheckedIn",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionClosed",
       "connectionId": 1,
-      "reason": "stale"
+      "reason": "stale",
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/pool-checkin-make-available.json b/test/cmap/pool-checkin-make-available.json
@@ -18,15 +18,18 @@
   "events": [
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedIn",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/pool-checkin.json b/test/cmap/pool-checkin.json
@@ -15,7 +15,8 @@
   "events": [
     {
       "type": "ConnectionCheckedIn",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/pool-checkout-connection.json b/test/cmap/pool-checkout-connection.json
@@ -9,16 +9,26 @@
   ],
   "events": [
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 1,
+      "address": 42
+    },
+    {
+      "type": "ConnectionReady",
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     }
   ],
   "ignore": [
-    "ConnectionPoolCreated",
-    "ConnectionCreated",
-    "ConnectionReady"
+    "ConnectionPoolCreated"
   ]
 }
diff --git a/test/cmap/pool-checkout-multiple.json b/test/cmap/pool-checkout-multiple.json
@@ -43,15 +43,18 @@
   "events": [
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/pool-checkout-no-idle.json b/test/cmap/pool-checkout-no-idle.json
@@ -30,20 +30,24 @@
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedIn",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionClosed",
       "connectionId": 1,
-      "reason": "idle"
+      "reason": "idle",
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 2
+      "connectionId": 2,
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/pool-checkout-no-stale.json b/test/cmap/pool-checkout-no-stale.json
@@ -26,11 +26,13 @@
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedIn",
-      "connectionId": 1
+      "connectionId": 1,
+      "address": 42
     },
     {
       "type": "ConnectionPoolCleared",
@@ -39,11 +41,13 @@
     {
       "type": "ConnectionClosed",
       "connectionId": 1,
-      "reason": "stale"
+      "reason": "stale",
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 2
+      "connectionId": 2,
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/pool-close-destroy-conns.json b/test/cmap/pool-close-destroy-conns.json
@@ -24,12 +24,14 @@
   "events": [
     {
       "type": "ConnectionCheckedIn",
-      "connectionId": 2
+      "connectionId": 2,
+      "address": 42
     },
     {
       "type": "ConnectionClosed",
       "connectionId": 2,
-      "reason": "poolClosed"
+      "reason": "poolClosed",
+      "address": 42
     },
     {
       "type": "ConnectionPoolClosed",
diff --git a/test/cmap/pool-create-max-size.json b/test/cmap/pool-create-max-size.json
@@ -53,59 +53,74 @@
       "options": 42
     },
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
     },
     {
       "type": "ConnectionCreated",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
     },
     {
       "type": "ConnectionCreated",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
     },
     {
       "type": "ConnectionCreated",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedIn",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
-      "type": "ConnectionCheckOutStarted"
+      "type": "ConnectionCheckOutStarted",
+      "address": 42
     },
     {
       "type": "ConnectionCheckedIn",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     },
     {
       "type": "ConnectionCheckedOut",
-      "connectionId": 42
+      "connectionId": 42,
+      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/cmap/pool-create-min-size.json b/test/cmap/pool-create-min-size.json
diff --git a/test/cmap/wait-queue-timeout.json b/test/cmap/wait-queue-timeout.json
diff --git a/test/test_cmap.py b/test/test_cmap.py

Original file line number	Diff line number	Diff line change
`@@ -12,26 +12,32 @@`
`12`	`12`	`],`
`13`	`13`	`"events": [`
`14`	`14`	`{`
`15`		`- "type": "ConnectionCheckOutStarted"`
	`15`	`+ "type": "ConnectionCheckOutStarted",`
	`16`	`+ "address": 42`
`16`	`17`	`},`
`17`	`18`	`{`
`18`	`19`	`"type": "ConnectionCreated",`
`19`		`- "connectionId": 42`
	`20`	`+ "connectionId": 42,`
	`21`	`+ "address": 42`
`20`	`22`	`},`
`21`	`23`	`{`
`22`	`24`	`"type": "ConnectionCheckedOut",`
`23`		`- "connectionId": 42`
	`25`	`+ "connectionId": 42,`
	`26`	`+ "address": 42`
`24`	`27`	`},`
`25`	`28`	`{`
`26`		`- "type": "ConnectionCheckOutStarted"`
	`29`	`+ "type": "ConnectionCheckOutStarted",`
	`30`	`+ "address": 42`
`27`	`31`	`},`
`28`	`32`	`{`
`29`	`33`	`"type": "ConnectionCreated",`
`30`		`- "connectionId": 42`
	`34`	`+ "connectionId": 42,`
	`35`	`+ "address": 42`
`31`	`36`	`},`
`32`	`37`	`{`
`33`	`38`	`"type": "ConnectionCheckedOut",`
`34`		`- "connectionId": 42`
	`39`	`+ "connectionId": 42,`
	`40`	`+ "address": 42`
`35`	`41`	`}`
`36`	`42`	`],`
`37`	`43`	`"ignore": [`
Original file line number	Diff line number	Diff line change
`@@ -18,20 +18,23 @@`
`18`	`18`	`"events": [`
`19`	`19`	`{`
`20`	`20`	`"type": "ConnectionCheckedOut",`
`21`		`- "connectionId": 1`
	`21`	`+ "connectionId": 1,`
	`22`	`+ "address": 42`
`22`	`23`	`},`
`23`	`24`	`{`
`24`	`25`	`"type": "ConnectionPoolClosed",`
`25`	`26`	`"address": 42`
`26`	`27`	`},`
`27`	`28`	`{`
`28`	`29`	`"type": "ConnectionCheckedIn",`
`29`		`- "connectionId": 1`
	`30`	`+ "connectionId": 1,`
	`31`	`+ "address": 42`
`30`	`32`	`},`
`31`	`33`	`{`
`32`	`34`	`"type": "ConnectionClosed",`
`33`	`35`	`"connectionId": 1,`
`34`		`- "reason": "poolClosed"`
	`36`	`+ "reason": "poolClosed",`
	`37`	`+ "address": 42`
`35`	`38`	`}`
`36`	`39`	`],`
`37`	`40`	`"ignore": [`
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,18 @@`
`18`	`18`	`"events": [`
`19`	`19`	`{`
`20`	`20`	`"type": "ConnectionCheckedOut",`
`21`		`- "connectionId": 1`
	`21`	`+ "connectionId": 1,`
	`22`	`+ "address": 42`
`22`	`23`	`},`
`23`	`24`	`{`
`24`	`25`	`"type": "ConnectionCheckedIn",`
`25`		`- "connectionId": 1`
	`26`	`+ "connectionId": 1,`
	`27`	`+ "address": 42`
`26`	`28`	`},`
`27`	`29`	`{`
`28`	`30`	`"type": "ConnectionCheckedOut",`
`29`		`- "connectionId": 1`
	`31`	`+ "connectionId": 1,`
	`32`	`+ "address": 42`
`30`	`33`	`}`
`31`	`34`	`],`
`32`	`35`	`"ignore": [`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@`
`15`	`15`	`"events": [`
`16`	`16`	`{`
`17`	`17`	`"type": "ConnectionCheckedIn",`
`18`		`- "connectionId": 42`
	`18`	`+ "connectionId": 42,`
	`19`	`+ "address": 42`
`19`	`20`	`}`
`20`	`21`	`],`
`21`	`22`	`"ignore": [`
Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,18 @@`
`43`	`43`	`"events": [`
`44`	`44`	`{`
`45`	`45`	`"type": "ConnectionCheckedOut",`
`46`		`- "connectionId": 42`
	`46`	`+ "connectionId": 42,`
	`47`	`+ "address": 42`
`47`	`48`	`},`
`48`	`49`	`{`
`49`	`50`	`"type": "ConnectionCheckedOut",`
`50`		`- "connectionId": 42`
	`51`	`+ "connectionId": 42,`
	`52`	`+ "address": 42`
`51`	`53`	`},`
`52`	`54`	`{`
`53`	`55`	`"type": "ConnectionCheckedOut",`
`54`		`- "connectionId": 42`
	`56`	`+ "connectionId": 42,`
	`57`	`+ "address": 42`
`55`	`58`	`}`
`56`	`59`	`],`
`57`	`60`	`"ignore": [`
Original file line number	Diff line number	Diff line change
`@@ -30,20 +30,24 @@`
`30`	`30`	`},`
`31`	`31`	`{`
`32`	`32`	`"type": "ConnectionCheckedOut",`
`33`		`- "connectionId": 1`
	`33`	`+ "connectionId": 1,`
	`34`	`+ "address": 42`
`34`	`35`	`},`
`35`	`36`	`{`
`36`	`37`	`"type": "ConnectionCheckedIn",`
`37`		`- "connectionId": 1`
	`38`	`+ "connectionId": 1,`
	`39`	`+ "address": 42`
`38`	`40`	`},`
`39`	`41`	`{`
`40`	`42`	`"type": "ConnectionClosed",`
`41`	`43`	`"connectionId": 1,`
`42`		`- "reason": "idle"`
	`44`	`+ "reason": "idle",`
	`45`	`+ "address": 42`
`43`	`46`	`},`
`44`	`47`	`{`
`45`	`48`	`"type": "ConnectionCheckedOut",`
`46`		`- "connectionId": 2`
	`49`	`+ "connectionId": 2,`
	`50`	`+ "address": 42`
`47`	`51`	`}`
`48`	`52`	`],`
`49`	`53`	`"ignore": [`