Skip to content

Commit

Permalink
Merge pull request #287 from biothings/mongodb_no_cursor_timeout_fix
Browse files Browse the repository at this point in the history
revise logging statements
  • Loading branch information
Yao Yao committed May 11, 2023
2 parents b9c387a + 7133ab9 commit 31e50d8
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions biothings/utils/mongo.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,11 @@ def doc_feeder(collection, step=1000, s=None, e=None, inbatch=False, query=None,
try:
# Explicitly create a session object for the cursor to attach
session: ClientSession = collection.database.client.start_session()
logger.debug("Session '%s' started.", session.session_id)
session_uuid = session.session_id["id"].as_uuid()
logger.debug("Session '%s' started for collection '%s'.", session_uuid, collection.name)

cur = collection.find(query, no_cursor_timeout=True, projection=fields, session=session)
logger.debug("Querying '%s' from collection '%s' in session '%s'.", query, collection.name, session.session_id)
# logger.debug("Querying '%s' from collection '%s' in session '%s'.", query, collection.name, session_uuid)
if s:
cur.skip(s)
logger.debug("Skipped %d documents from collection '%s'.", s, collection.name)
Expand All @@ -378,7 +379,7 @@ def doc_feeder(collection, step=1000, s=None, e=None, inbatch=False, query=None,
session_should_refresh = (session_current_time - session_last_refresh_time) > session_refresh_interval * 60
if session_should_refresh:
cmd_resp = collection.database.command("refreshSessions", [session.session_id], session=session)
logger.debug("Session '%s' refreshed, resp=%s", session.session_id, cmd_resp)
logger.debug("Session '%s' refreshed, resp=%s", session_uuid, cmd_resp)
session_last_refresh_time = session_current_time

if inbatch:
Expand Down Expand Up @@ -407,7 +408,7 @@ def doc_feeder(collection, step=1000, s=None, e=None, inbatch=False, query=None,
logger.debug("Finished.[total time: %s]", timesofar(job_start_time))
finally:
cur.close()
logger.debug("Session '%s' to be ended.", session.session_id)
logger.debug("Session '%s' to be ended.", session_uuid)
session.end_session()


Expand Down

0 comments on commit 31e50d8

Please sign in to comment.