PYTHON-691 - Fix UserWarning command issues.

Don't raise UserWarning for helpers and internal calls to commands that do not obey read preference.

Author: behackett

gridfs/grid_file.py

@@ -30,6 +30,7 @@
 from pymongo.collection import Collection
 from pymongo.cursor import Cursor
 from pymongo.errors import DuplicateKeyError
+from pymongo.read_preferences import ReadPreference
 
 try:
  _SEEK_SET = os.SEEK_SET
@@ -258,7 +259,8 @@ def __flush(self):
  db.error()
 
  md5 = db.command(
- "filemd5", self._id, root=self._coll.name)["md5"]
+ "filemd5", self._id, root=self._coll.name,
+ read_preference=ReadPreference.PRIMARY)["md5"]
 
  self._file["md5"] = md5
  self._file["length"] = self._position

pymongo/collection.py

@@ -28,6 +28,7 @@
 from pymongo.errors import InvalidName, OperationFailure
 from pymongo.helpers import _check_write_command_response
 from pymongo.message import _INSERT, _UPDATE, _DELETE
+from pymongo.read_preferences import ReadPreference
 
 
 try:
@@ -125,9 +126,12 @@ def __create(self, options):
  if options:
  if "size" in options:
  options["size"] = float(options["size"])
- self.__database.command("create", self.__name, **options)
+ self.__database.command("create", self.__name,
+ read_preference=ReadPreference.PRIMARY,
+ **options)
  else:
- self.__database.command("create", self.__name)
+ self.__database.command("create", self.__name,
+ read_preference=ReadPreference.PRIMARY)
 
  def __getattr__(self, name):
  """Get a sub-collection of this collection by name.
@@ -1037,7 +1041,9 @@ def create_index(self, key_or_list, cache_for=300, **kwargs):
  index.update(kwargs)
 
  try:
- self.__database.command('createIndexes', self.name, indexes=[index])
+ self.__database.command('createIndexes', self.name,
+ read_preference=ReadPreference.PRIMARY,
+ indexes=[index])
  except OperationFailure, exc:
  if exc.code in (59, None):
  index["ns"] = self.__full_name
@@ -1183,7 +1189,9 @@ def drop_index(self, index_or_name):
 
  self.__database.connection._purge_index(self.__database.name,
  self.__name, name)
- self.__database.command("dropIndexes", self.__name, index=name,
+ self.__database.command("dropIndexes", self.__name,
+ read_preference=ReadPreference.PRIMARY,
+ index=name,
  allowable_errors=["ns not found"])
 
  def reindex(self):
@@ -1195,7 +1203,8 @@ def reindex(self):
 
  .. versionadded:: 1.11+
  """
- return self.__database.command("reIndex", self.__name)
+ return self.__database.command("reIndex", self.__name,
+ read_preference=ReadPreference.PRIMARY)
 
  def index_information(self):
  """Get information on this collection's indexes.
@@ -1416,9 +1425,10 @@ def rename(self, new_name, **kwargs):
  raise InvalidName("collection names must not contain '$'")
 
  new_name = "%s.%s" % (self.__database.name, new_name)
- self.__database.connection.admin.command("renameCollection",
- self.__full_name,
- to=new_name, **kwargs)
+ client = self.__database.connection
+ client.admin.command("renameCollection", self.__full_name,
+ read_preference=ReadPreference.PRIMARY,
+ to=new_name, **kwargs)
 
  def distinct(self, key):
  """Get a list of distinct values for `key` among all documents
@@ -1645,6 +1655,7 @@ def find_and_modify(self, query={}, update=None,
 
  out = self.__database.command("findAndModify", self.__name,
  allowable_errors=[no_obj_error],
+ read_preference=ReadPreference.PRIMARY,
  uuid_subtype=self.uuid_subtype,
  **kwargs)
 

pymongo/database.py

@@ -26,7 +26,9 @@
  ConfigurationError,
  InvalidName,
  OperationFailure)
-from pymongo import read_preferences as rp
+from pymongo.read_preferences import (modes,
+ secondary_ok_commands,
+ ReadPreference)
 
 
 def _check_name(name):
@@ -282,7 +284,7 @@ def _command(self, command, value=1,
 
  command_name = command.keys()[0].lower()
  must_use_master = kwargs.pop('_use_master', False)
- if command_name not in rp.secondary_ok_commands:
+ if command_name not in secondary_ok_commands:
  must_use_master = True
 
  # Special-case: mapreduce can go to secondaries only if inline
@@ -323,13 +325,13 @@ def _command(self, command, value=1,
  command.update(kwargs)
 
  # Warn if must_use_master will override read_preference.
- if (extra_opts['read_preference'] != rp.ReadPreference.PRIMARY and
+ if (extra_opts['read_preference'] != ReadPreference.PRIMARY and
  extra_opts['_must_use_master']):
  warnings.warn("%s does not support %s read preference "
  "and will be routed to the primary instead." %
  (command_name,
- rp.modes[extra_opts['read_preference']]),
- UserWarning)
+ modes[extra_opts['read_preference']]),
+ UserWarning, stacklevel=3)
 
  cursor = self["$cmd"].find(command, **extra_opts).limit(-1)
  for doc in cursor:
@@ -466,7 +468,8 @@ def drop_collection(self, name_or_collection):
 
  self.__connection._purge_index(self.__name, name)
 
- self.command("drop", unicode(name), allowable_errors=["ns not found"])
+ self.command("drop", unicode(name), allowable_errors=["ns not found"],
+ read_preference=ReadPreference.PRIMARY)
 
  def validate_collection(self, name_or_collection,
  scandata=False, full=False):
@@ -504,7 +507,8 @@ def validate_collection(self, name_or_collection,
  "%s or Collection" % (basestring.__name__,))
 
  result = self.command("validate", unicode(name),
- scandata=scandata, full=full)
+ scandata=scandata, full=full,
+ read_preference=ReadPreference.PRIMARY)
 
  valid = True
  # Pre 1.9 results
@@ -553,7 +557,8 @@ def profiling_level(self):
 
  .. mongodoc:: profiling
  """
- result = self.command("profile", -1)
+ result = self.command("profile", -1,
+ read_preference=ReadPreference.PRIMARY)
 
  assert result["was"] >= 0 and result["was"] <= 2
  return result["was"]
@@ -593,9 +598,11 @@ def set_profiling_level(self, level, slow_ms=None):
  raise TypeError("slow_ms must be an integer")
 
  if slow_ms is not None:
- self.command("profile", level, slowms=slow_ms)
+ self.command("profile", level, slowms=slow_ms,
+ read_preference=ReadPreference.PRIMARY)
  else:
- self.command("profile", level)
+ self.command("profile", level,
+ read_preference=ReadPreference.PRIMARY)
 
  def profiling_info(self):
  """Returns a list containing current profiling information.
@@ -610,7 +617,8 @@ def error(self):
  Return None if the last operation was error-free. Otherwise return the
  error that occurred.
  """
- error = self.command("getlasterror")
+ error = self.command("getlasterror",
+ read_preference=ReadPreference.PRIMARY)
  error_msg = error.get("err", "")
  if error_msg is None:
  return None
@@ -623,7 +631,8 @@ def last_status(self):
 
  Returns a SON object with status information.
  """
- return self.command("getlasterror")
+ return self.command("getlasterror",
+ read_preference=ReadPreference.PRIMARY)
 
  def previous_error(self):
  """Get the most recent error to have occurred on this database.
@@ -632,7 +641,8 @@ def previous_error(self):
  `Database.reset_error_history`. Returns None if no such errors have
  occurred.
  """
- error = self.command("getpreverror")
+ error = self.command("getpreverror",
+ read_preference=ReadPreference.PRIMARY)
  if error.get("err", 0) is None:
  return None
  return error
@@ -643,7 +653,8 @@ def reset_error_history(self):
  Calls to `Database.previous_error` will only return errors that have
  occurred since the most recent call to this method.
  """
- self.command("reseterror")
+ self.command("reseterror",
+ read_preference=ReadPreference.PRIMARY)
 
  def __iter__(self):
  return self
@@ -697,7 +708,8 @@ def _create_or_update_user(
  else:
  command_name = "updateUser"
 
- self.command(command_name, name, **opts)
+ self.command(command_name, name,
+ read_preference=ReadPreference.PRIMARY, **opts)
 
  def _legacy_add_user(self, name, password, read_only, **kwargs):
  """Uses v1 system to add users, i.e. saving to system.users.
@@ -763,7 +775,8 @@ def add_user(self, name, password=None, read_only=None, **kwargs):
  "read_only and roles together")
 
  try:
- uinfo = self.command("usersInfo", name)
+ uinfo = self.command("usersInfo", name,
+ read_preference=ReadPreference.PRIMARY)
  except OperationFailure, exc:
  # MongoDB >= 2.5.3 requires the use of commands to manage
  # users. "No such command" error didn't return an error
@@ -793,6 +806,7 @@ def remove_user(self, name):
 
  try:
  self.command("dropUser", name,
+ read_preference=ReadPreference.PRIMARY,
  writeConcern=self._get_wc_override())
  except OperationFailure, exc:
  # See comment in add_user try / except above.
@@ -930,7 +944,9 @@ def eval(self, code, *args):
  if not isinstance(code, Code):
  code = Code(code)
 
- result = self.command("$eval", code, args=args)
+ result = self.command("$eval", code,
+ read_preference=ReadPreference.PRIMARY,
+ args=args)
  return result.get("retval", None)
 
  def __call__(self, *args, **kwargs):

pymongo/mongo_client.py

@@ -61,6 +61,9 @@
  InvalidURI,
  OperationFailure)
 from pymongo.member import Member
+from pymongo.read_preferences import ReadPreference
+
+
 EMPTY = b("")
 
 
@@ -1337,13 +1340,15 @@ def kill_cursors(self, cursor_ids):
  def server_info(self):
  """Get information about the MongoDB server we're connected to.
  """
- return self.admin.command("buildinfo")
+ return self.admin.command("buildinfo",
+ read_preference=ReadPreference.PRIMARY)
 
  def database_names(self):
  """Get a list of the names of all databases on the connected server.
  """
  return [db["name"] for db in
- self.admin.command("listDatabases")["databases"]]
+ self.admin.command("listDatabases",
+ read_preference=ReadPreference.PRIMARY)["databases"]]
 
  def drop_database(self, name_or_database):
  """Drop a database.
@@ -1365,7 +1370,8 @@ def drop_database(self, name_or_database):
  "%s or Database" % (basestring.__name__,))
 
  self._purge_index(name)
- self[name].command("dropDatabase")
+ self[name].command("dropDatabase",
+ read_preference=ReadPreference.PRIMARY)
 
  def copy_database(self, from_name, to_name,
  from_host=None, username=None, password=None):
@@ -1413,12 +1419,15 @@ def copy_database(self, from_name, to_name,
 
  if username is not None:
  nonce = self.admin.command("copydbgetnonce",
- fromhost=from_host)["nonce"]
+ read_preference=ReadPreference.PRIMARY,
+ fromhost=from_host)["nonce"]
  command["username"] = username
  command["nonce"] = nonce
  command["key"] = auth._auth_key(nonce, username, password)
 
- return self.admin.command("copydb", **command)
+ return self.admin.command("copydb",
+ read_preference=ReadPreference.PRIMARY,
+ **command)
  finally:
  self.end_request()
 
@@ -1467,7 +1476,8 @@ def fsync(self, **kwargs):
 
  .. versionadded:: 2.0
  """
- self.admin.command("fsync", **kwargs)
+ self.admin.command("fsync",
+ read_preference=ReadPreference.PRIMARY, **kwargs)
 
  def unlock(self):
  """Unlock a previously locked server.

pymongo/mongo_replica_set_client.py

@@ -59,6 +59,7 @@
  DuplicateKeyError,
  OperationFailure,
  InvalidOperation)
+from pymongo.read_preferences import ReadPreference
 from pymongo.thread_util import DummyLock
 
 EMPTY = b("")
@@ -1832,13 +1833,15 @@ def close_cursor(self, cursor_id, _conn_id):
  def server_info(self):
  """Get information about the MongoDB primary we're connected to.
  """
- return self.admin.command("buildinfo")
+ return self.admin.command("buildinfo",
+ read_preference=ReadPreference.PRIMARY)
 
  def database_names(self):
  """Get a list of the names of all databases on the connected server.
  """
  return [db["name"] for db in
- self.admin.command("listDatabases")["databases"]]
+ self.admin.command("listDatabases",
+ read_preference=ReadPreference.PRIMARY)["databases"]]
 
  def drop_database(self, name_or_database):
  """Drop a database.
@@ -1860,7 +1863,8 @@ def drop_database(self, name_or_database):
  "%s or Database" % (basestring.__name__,))
 
  self._purge_index(name)
- self[name].command("dropDatabase")
+ self[name].command("dropDatabase",
+ read_preference=ReadPreference.PRIMARY)
 
  def copy_database(self, from_name, to_name,
  from_host=None, username=None, password=None):
@@ -1906,12 +1910,15 @@ def copy_database(self, from_name, to_name,
 
  if username is not None:
  nonce = self.admin.command("copydbgetnonce",
- fromhost=from_host)["nonce"]
+ read_preference=ReadPreference.PRIMARY,
+ fromhost=from_host)["nonce"]
  command["username"] = username
  command["nonce"] = nonce
  command["key"] = auth._auth_key(nonce, username, password)
 
- return self.admin.command("copydb", **command)
+ return self.admin.command("copydb",
+ read_preference=ReadPreference.PRIMARY,
+ **command)
  finally:
  self.end_request()