Support 1.9 sharded output in validate_collection.

mongodb · Apr 29, 2011 · 1b52371 · 1b52371
1 parent 3a3584e
commit 1b52371
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/pymongo/database.py b/pymongo/database.py
@@ -355,11 +355,23 @@ def validate_collection(self, name_or_collection, full=False):
 
         result = self.command("validate", unicode(name), full=full)
 
+        valid = True
+        # Pre 1.9 results
         if "result" in result:
             info = result["result"]
             if info.find("exception") != -1 or info.find("corrupt") != -1:
                 raise CollectionInvalid("%s invalid: %s" % (name, info))
+        # Post 1.9 sharded results
+        elif "raw" in result:
+            for repl, res in result["raw"].iteritems():
+                if not res.get("valid", False):
+                    valid = False
+                    break
+        # Post 1.9 non-sharded results.
         elif not result.get("valid", False):
+            valid = False
+
+        if not valid:
             raise CollectionInvalid("%s invalid: %r" % (name, result))
 
         return result