Raise InvalidOperation if monitor thread is dead.

Author: A. Jesse Jiryu Davis

pymongo/mongo_replica_set_client.py

@@ -56,7 +56,8 @@
  ConnectionFailure,
  DuplicateKeyError,
  InvalidDocument,
- OperationFailure)
+ OperationFailure,
+ InvalidOperation)
 
 EMPTY = b("")
 MAX_BSON_SIZE = 4 * 1024 * 1024
@@ -282,6 +283,10 @@ def shutdown(self, dummy=None):
  def schedule_refresh(self):
  """Refresh immediately
  """
+ if not self.isAlive():
+ raise InvalidOperation(
+ "Monitor thread is dead: Perhaps started before a fork?")
+
  self.refreshed.clear()
  self.event.set()
 
@@ -313,8 +318,11 @@ def monitor(self):
  except:
  break
 
+ def isAlive(self):
+ raise NotImplementedError()
 
-class MonitorThread(Monitor, threading.Thread):
+
+class MonitorThread(threading.Thread, Monitor):
  """Thread based replica set monitor.
  """
  def __init__(self, rsc):
@@ -325,14 +333,6 @@ def __init__(self, rsc):
  # Track whether the thread has started. (Greenlets track this already.)
  self.started = False
 
- def schedule_refresh(self):
- """Override Monitor's schedule_refresh method
- raise exception as warning if thread is dead
- """
- if not self.isAlive():
- raise Exception("Monitor thread died unexpectedly, used with fork?")
- super(MonitorThread, self).schedule_refresh()
-
  def start(self):
  self.started = True
  super(MonitorThread, self).start()
@@ -367,6 +367,10 @@ def _run(self):
  """
  self.monitor()
 
+ def isAlive(self):
+ # Gevent defines bool(Greenlet) as True if it's alive.
+ return bool(self)
+
 except ImportError:
  pass
 

test/test_replica_set_client.py

@@ -45,7 +45,7 @@
  ConfigurationError,
  ConnectionFailure,
  InvalidName,
- OperationFailure)
+ OperationFailure, InvalidOperation)
 from test import version, port, pair
 from test.utils import (
  delay, assertReadFrom, assertReadFromAll, read_from_which_host,
@@ -580,7 +580,7 @@ def test_fork_and_schedule_refresh(self):
  def f(pipe):
  try:
  # Trigger a refresh.
- self.assertRaises(Exception, client.disconnect)
+ self.assertRaises(InvalidOperation, client.disconnect)
  except:
  traceback.print_exc()
  pipe.send(True)