Commit d88596c

NoahStappJibola

and

authored

PYTHON-5218 - Add logging statement when SRV polling fails (#2463)

Co-authored-by: Jib <Jibzade@gmail.com>

1 parent ad16d6e commit d88596cCopy full SHA for d88596c

File tree

+30

-2

lines changed

+30

-2

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -423,12 +423,13 @@ async def _get_seedlist(self) -> Optional[list[tuple[str, Any]]]:`
`423`	`423`	`if len(seedlist) == 0:`
`424`	`424`	`# As per the spec: this should be treated as a failure.`
`425`	`425`	`raise Exception`
`426`		`- except Exception:`
	`426`	`+ except Exceptionasexc:`
`427`	`427`	`# As per the spec, upon encountering an error:`
`428`	`428`	`# - An error must not be raised`
`429`	`429`	`# - SRV records must be rescanned every heartbeatFrequencyMS`
`430`	`430`	`# - Topology must be left unchanged`
`431`	`431`	`self.request_check()`
	`432`	`+ _debug_log(_SDAM_LOGGER, message="SRV monitor check failed", failure=repr(exc))`
`432`	`433`	`return None`
`433`	`434`	`else:`
`434`	`435`	`self._executor.update_interval(max(ttl, common.MIN_SRV_RESCAN_INTERVAL))`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -421,12 +421,13 @@ def _get_seedlist(self) -> Optional[list[tuple[str, Any]]]:`
`421`	`421`	`if len(seedlist) == 0:`
`422`	`422`	`# As per the spec: this should be treated as a failure.`
`423`	`423`	`raise Exception`
`424`		`- except Exception:`
	`424`	`+ except Exceptionasexc:`
`425`	`425`	`# As per the spec, upon encountering an error:`
`426`	`426`	`# - An error must not be raised`
`427`	`427`	`# - SRV records must be rescanned every heartbeatFrequencyMS`
`428`	`428`	`# - Topology must be left unchanged`
`429`	`429`	`self.request_check()`
	`430`	`+ _debug_log(_SDAM_LOGGER, message="SRV monitor check failed", failure=repr(exc))`
`430`	`431`	`return None`
`431`	`432`	`else:`
`432`	`433`	`self._executor.update_interval(max(ttl, common.MIN_SRV_RESCAN_INTERVAL))`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,19 @@ def response_callback(*args):`
`225`	`225`
`226`	`226`	`await self.run_scenario(response_callback, False)`
`227`	`227`
	`228`	`+ async def test_dns_failures_logging(self):`
	`229`	`+ from dns import exception`
	`230`	`+`
	`231`	`+ with self.assertLogs("pymongo.topology", level="DEBUG") as cm:`
	`232`	`+`
	`233`	`+ def response_callback(*args):`
	`234`	`+ raise exception.Timeout("DNS Failure!")`
	`235`	`+`
	`236`	`+ await self.run_scenario(response_callback, False)`
	`237`	`+`
	`238`	`+ srv_failure_logs = [r for r in cm.records if "SRV monitor check failed" in r.getMessage()]`
	`239`	`+ self.assertEqual(len(srv_failure_logs), 1)`
	`240`	`+`
`228`	`241`	`async def test_dns_record_lookup_empty(self):`
`229`	`242`	`response: list = []`
`230`	`243`	`await self.run_scenario(response, False)`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,19 @@ def response_callback(*args):`
`225`	`225`
`226`	`226`	`self.run_scenario(response_callback, False)`
`227`	`227`
	`228`	`+ def test_dns_failures_logging(self):`
	`229`	`+ from dns import exception`
	`230`	`+`
	`231`	`+ with self.assertLogs("pymongo.topology", level="DEBUG") as cm:`
	`232`	`+`
	`233`	`+ def response_callback(*args):`
	`234`	`+ raise exception.Timeout("DNS Failure!")`
	`235`	`+`
	`236`	`+ self.run_scenario(response_callback, False)`
	`237`	`+`
	`238`	`+ srv_failure_logs = [r for r in cm.records if "SRV monitor check failed" in r.getMessage()]`
	`239`	`+ self.assertEqual(len(srv_failure_logs), 1)`
	`240`	`+`
`228`	`241`	`def test_dns_record_lookup_empty(self):`
`229`	`242`	`response: list = []`
`230`	`243`	`self.run_scenario(response, False)`

Comments

(0)