PYTHON-979 - Update fsyncUnlock helper for command monitoring

Author: behackett

pymongo/mongo_client.py

@@ -1092,18 +1092,19 @@ def fsync(self, **kwargs):
  def unlock(self):
  """Unlock a previously locked server.
  """
+ cmd = {"fsyncUnlock": 1}
  with self._socket_for_writes() as sock_info:
  if sock_info.max_wire_version >= 4:
  try:
- sock_info.command("admin", {"fsyncUnlock": 1})
+ sock_info.command("admin", cmd)
  except OperationFailure as exc:
  # Ignore "DB not locked" to replicate old behavior
  if exc.code != 125:
  raise
  else:
  helpers._first_batch(sock_info, "admin.$cmd.sys.unlock",
- {}, -1, True, self.codec_options, ReadPreference.PRIMARY)
-
+ {}, -1, True, self.codec_options,
+ ReadPreference.PRIMARY, cmd, self._event_listeners)
 
  def __enter__(self):
  return self

test/test_monitoring.py

@@ -30,7 +30,7 @@
 from pymongo.read_preferences import ReadPreference
 from pymongo.write_concern import WriteConcern
 from test import unittest, client_context, client_knobs
-from test.utils import single_client
+from test.utils import single_client, wait_until
 
 
 class EventListener(monitoring.CommandListener):
@@ -1248,6 +1248,29 @@ def test_first_batch_helper(self):
  self.assertEqual(started.request_id, succeeded.request_id)
  self.assertEqual(started.connection_id, succeeded.connection_id)
 
+ if not client_context.is_mongos:
+ self.client.fsync(lock=True)
+ self.listener.results.clear()
+ self.client.unlock()
+ # Wait for async unlock...
+ wait_until(
+ lambda: not self.client.is_locked, "unlock the database")
+ started = results['started'][0]
+ succeeded = results['succeeded'][0]
+ self.assertEqual(0, len(results['failed']))
+ self.assertIsInstance(started, monitoring.CommandStartedEvent)
+ expected = {'fsyncUnlock': 1}
+ self.assertEqual(expected, started.command)
+ self.assertEqual('admin', started.database_name)
+ self.assertEqual('fsyncUnlock', started.command_name)
+ self.assertIsInstance(started.request_id, int)
+ self.assertEqual(self.client.address, started.connection_id)
+ self.assertIsInstance(succeeded, monitoring.CommandSucceededEvent)
+ self.assertIsInstance(succeeded.duration_micros, int)
+ self.assertEqual(started.command_name, succeeded.command_name)
+ self.assertEqual(started.request_id, succeeded.request_id)
+ self.assertEqual(started.connection_id, succeeded.connection_id)
+
  def test_sensitive_commands(self):
  listeners = self.client._event_listeners