From 397f0fb0ba2b91998b57b2aa53d99134172b1b5a Mon Sep 17 00:00:00 2001
From: Bryan Crowe <bryan@bryan-crowe.com>
Date: Tue, 10 Feb 2015 23:14:36 -0500
Subject: [PATCH 1/2] Add max retries for CRUD operations in collection

---
 src/League/Monga/Collection.php | 170 +++++++++++++++++++++++---------
 1 file changed, 121 insertions(+), 49 deletions(-)

diff --git a/src/League/Monga/Collection.php b/src/League/Monga/Collection.php
index a279a88..f657d24 100644
--- a/src/League/Monga/Collection.php
+++ b/src/League/Monga/Collection.php
@@ -22,6 +22,11 @@ class Collection
      */
     protected $collection;
 
+    /**
+     * @var  int  Amount of times to retry CRUD operations for "not master"
+     */
+    protected $maxRetries = 1;
+
     /**
      * Constructor, sets the MongoCollection instance.
      *
@@ -56,6 +61,21 @@ public function setCollection(MongoCollection $collection)
         return $this;
     }
 
+    /**
+     * Set the max amount of times to retry CRUD operations in the case of
+     * "not master" exceptions.
+     *
+     * @param int $amount The amount of times
+     *
+     * @return object $this
+     */
+    public function setMaxRetries($amount)
+    {
+        $this->maxRetries = $amount;
+
+        return $this;
+    }
+
     /**
      * Drops the current collection.
      *
@@ -221,18 +241,29 @@ public function remove($criteria, $options = array())
             throw new \InvalidArgumentException('Remove criteria must be an array.');
         }
 
-        try {
-            $result = $this->collection->remove($criteria, $options);
-        } catch (MongoCursorException $e) {
-            // Retry "remove" in case of rediscovery latency issues
-            // in replica set failover. Error codes 10107, 13435, and 10058
-            // are MongoCursorException's "not master" errors.
-            if (in_array($e->getCode(), array(10107, 13435, 10058))) {
+        $maxRetries = $this->maxRetries;
+        $tries = 0;
+
+        do {
+            try {
                 $result = $this->collection->remove($criteria, $options);
-            } else {
-                throw $e;
+                break;
+            } catch (MongoCursorException $e) {
+                // Retry "save" in case of rediscovery latency issues
+                // in replica set failover. Error codes 10107, 13435, and 10058
+                // are MongoCursorException's "not master" errors.
+                if (in_array($e->getCode(), array(10107, 13435, 10058))) {
+                    if ($tries === $maxRetries) {
+                        throw $e;
+                    } else {
+                        $tries++;
+                        continue;
+                    }
+                } else {
+                    throw $e;
+                }
             }
-        }
+        } while ($tries <= $maxRetries);
 
         return $result === true || (bool) $result['ok'];
     }
@@ -323,21 +354,32 @@ public function findOne($query = array(), $fields = array())
      */
     public function insert(array $data, $options = array())
     {
+        $maxRetries = $this->maxRetries;
+        $tries = 0;
+
         // Check whether we're dealing with a batch insert.
         if (isset($data[0]) && is_array($data[0])) {
             // Insert using batchInsert
-            try {
-                $result = $this->collection->batchInsert($data, $options);
-            } catch (MongoCursorException $e) {
-                // Retry "batchInsert" in case of rediscovery latency issues
-                // in replica set failover. Error codes 10107, 13435, and 10058
-                // are MongoCursorException's "not master" errors.
-                if (in_array($e->getCode(), array(10107, 13435, 10058))) {
+            do {
+                try {
                     $result = $this->collection->batchInsert($data, $options);
-                } else {
-                    throw $e;
+                    break;
+                } catch (MongoCursorException $e) {
+                    // Retry "save" in case of rediscovery latency issues
+                    // in replica set failover. Error codes 10107, 13435, and 10058
+                    // are MongoCursorException's "not master" errors.
+                    if (in_array($e->getCode(), array(10107, 13435, 10058))) {
+                        if ($tries === $maxRetries) {
+                            throw $e;
+                        } else {
+                            $tries++;
+                            continue;
+                        }
+                    } else {
+                        throw $e;
+                    }
                 }
-            }
+            } while ($tries <= $maxRetries);
 
             if (! $result || ! ($result === true || (bool) $result['ok'])) {
                 return false;
@@ -354,18 +396,26 @@ public function insert(array $data, $options = array())
             return $result;
         }
 
-        try {
-            $result = $this->collection->insert($data, $options);
-        } catch (MongoCursorException $e) {
-            if (in_array($e->getCode(), array(10107, 13435, 10058))) {
-                // Retry "insert" in case of rediscovery latency issues
+        do {
+            try {
+                $result = $this->collection->insert($data, $options);
+                break;
+            } catch (MongoCursorException $e) {
+                // Retry "save" in case of rediscovery latency issues
                 // in replica set failover. Error codes 10107, 13435, and 10058
                 // are MongoCursorException's "not master" errors.
-                $result = $this->collection->insert($data, $options);
-            } else {
-                throw $e;
+                if (in_array($e->getCode(), array(10107, 13435, 10058))) {
+                    if ($tries === $maxRetries) {
+                        throw $e;
+                    } else {
+                        $tries++;
+                        continue;
+                    }
+                } else {
+                    throw $e;
+                }
             }
-        }
+        } while ($tries <= $maxRetries);
 
         if ($result === true || (bool) $result['ok']) {
             return $data['_id'];
@@ -401,18 +451,29 @@ public function update($values = array(), $query = null, $options = array())
 
         isset($query) || $query = array();
 
-        try {
-            $result = $this->collection->update($query, $values, $options);
-        } catch (MongoCursorException $e) {
-            // Retry "update" in case of rediscovery latency issues
-            // in replica set failover. Error codes 10107, 13435, and 10058
-            // are MongoCursorException's "not master" errors.
-            if (in_array($e->getCode(), array(10107, 13435, 10058))) {
+        $maxRetries = $this->maxRetries;
+        $tries = 0;
+
+        do {
+            try {
                 $result = $this->collection->update($query, $values, $options);
-            } else {
-                throw $e;
+                break;
+            } catch (MongoCursorException $e) {
+                // Retry "save" in case of rediscovery latency issues
+                // in replica set failover. Error codes 10107, 13435, and 10058
+                // are MongoCursorException's "not master" errors.
+                if (in_array($e->getCode(), array(10107, 13435, 10058))) {
+                    if ($tries === $maxRetries) {
+                        throw $e;
+                    } else {
+                        $tries++;
+                        continue;
+                    }
+                } else {
+                    throw $e;
+                }
             }
-        }
+        } while ($tries <= $maxRetries);
 
         return $result === true || (bool) $result['ok'];
     }
@@ -427,18 +488,29 @@ public function update($values = array(), $query = null, $options = array())
      */
     public function save(&$document, $options = array())
     {
-        try {
-            $result = $this->collection->save($document, $options);
-        } catch (MongoCursorException $e) {
-            // Retry "save" in case of rediscovery latency issues
-            // in replica set failover. Error codes 10107, 13435, and 10058
-            // are MongoCursorException's "not master" errors.
-            if (in_array($e->getCode(), array(10107, 13435, 10058))) {
+        $maxRetries = $this->maxRetries;
+        $tries = 0;
+
+        do {
+            try {
                 $result = $this->collection->save($document, $options);
-            } else {
-                throw $e;
+                break;
+            } catch (MongoCursorException $e) {
+                // Retry "save" in case of rediscovery latency issues
+                // in replica set failover. Error codes 10107, 13435, and 10058
+                // are MongoCursorException's "not master" errors.
+                if (in_array($e->getCode(), array(10107, 13435, 10058))) {
+                    if ($tries === $maxRetries) {
+                        throw $e;
+                    } else {
+                        $tries++;
+                        continue;
+                    }
+                } else {
+                    throw $e;
+                }
             }
-        }
+        } while ($tries <= $maxRetries);
 
         return $result === true || (bool) $result['ok'];
     }

From 592e76680d2d6d557a27d80b75a760282d0ed7d9 Mon Sep 17 00:00:00 2001
From: Bryan Crowe <bryan@bryan-crowe.com>
Date: Tue, 10 Feb 2015 23:33:51 -0500
Subject: [PATCH 2/2] Add test for max retries setter

---
 tests/CollectionTests.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/CollectionTests.php b/tests/CollectionTests.php
index 3331018..590898c 100644
--- a/tests/CollectionTests.php
+++ b/tests/CollectionTests.php
@@ -51,6 +51,15 @@ public function testSetCollection()
         $this->collection->setCollection($original);
     }
 
+    public function testSetMaxRetries()
+    {
+        $this->collection->setMaxRetries(5);
+        $reflection = new ReflectionObject($this->collection);
+        $property = $reflection->getProperty('maxRetries');
+        $property->setAccessible(true);
+        $this->assertEquals(5, $property->getValue($this->collection));
+    }
+
     public function testCount()
     {
         $result = $this->collection->count();