Add retry for qeury execution after catch of not primary execption or interrupted execption durin primary switch process

Author: AlexNesvat

Dockerfile

@@ -1,5 +1,5 @@
 ARG PHP_VERSION=8.0
-ARG COMPOSER_VERSION=2.0
+ARG COMPOSER_VERSION=2.5.4
 
 FROM composer:${COMPOSER_VERSION}
 FROM php:${PHP_VERSION}-cli
@@ -13,3 +13,11 @@ RUN apt-get update && \
 COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 
 WORKDIR /code
+
+COPY composer.* ./
+
+COPY ./ ./
+
+RUN composer install
+
+CMD ["./vendor/bin/phpunit"]

docker-compose.yml

@@ -3,32 +3,29 @@ version: '3'
 services:
     tests:
         container_name: tests
+        tty: true
         build:
             context: .
             dockerfile: Dockerfile
         volumes:
             - .:/code
         working_dir: /code
         depends_on:
-          - mongodb
-          - mysql
+            - mongodb
+            - mysql
 
     mysql:
         container_name: mysql
-        image: mysql:5.7
+        image: mysql:8.0
         ports:
-            - 3306:3306
+            - "3306:3306"
         environment:
             MYSQL_ROOT_PASSWORD:
             MYSQL_DATABASE: unittest
             MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        logging:
-            driver: none
 
     mongodb:
         container_name: mongodb
-        image: mongo
+        image: mongo:latest
         ports:
-            - 27017:27017
-        logging:
-            driver: none
+            - "27017:27017"

phpunit.xml.dist

@@ -38,7 +38,7 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="MONGODB_URI" value="mongodb://127.0.0.1/" />
+        <env name="MONGODB_URI" value="mongodb://mongodb:27017/"/>
         <env name="MONGODB_DATABASE" value="unittest"/>
         <env name="MYSQL_HOST" value="mysql"/>
         <env name="MYSQL_PORT" value="3306"/>

src/Collection.php

@@ -3,6 +3,7 @@
 namespace Jenssegers\Mongodb;
 
 use Exception;
+use Illuminate\Support\Facades\Log;
 use MongoDB\BSON\ObjectID;
 use MongoDB\Collection as MongoCollection;
 
@@ -23,8 +24,8 @@ class Collection
     protected $collection;
 
     /**
-     * @param  Connection  $connection
-     * @param  MongoCollection  $collection
+     * @param Connection $connection
+     * @param MongoCollection $collection
      */
     public function __construct(Connection $connection, MongoCollection $collection)
     {
@@ -35,14 +36,33 @@ public function __construct(Connection $connection, MongoCollection $collection)
     /**
      * Handle dynamic method calls.
      *
-     * @param  string  $method
-     * @param  array  $parameters
+     * @param string $method
+     * @param array $parameters
      * @return mixed
      */
     public function __call(string $method, array $parameters)
     {
         $start = microtime(true);
-        $result = $this->collection->$method(...$parameters);
+        try {
+            $result = $this->collection->$method(...$parameters);
+        } catch (Exception $e) {
+//            11602 - operation was interrupted
+//            10107 - not primary
+            if ($e->getCode() == 11602 || $e->getCode() == 10107) {
+                Log::info(
+                    'Query execution was interrupted and will be retried',
+                    ['code' => $e->getCode(), 'mess' => $e->getMessage(), 'params' => $parameters]
+                );
+            } else {
+                Log::info('Unexpected error', [
+                    'mess' => $e->getMessage(),
+                    'code' => $e->getCode(),
+                    'file' => $e->getFile(),
+                    'line' => $e->getLine(),
+                ]);
+            }
+            $result = $this->collection->$method(...$parameters);
+        }
 
         // Once we have run the query we will calculate the time that it took to run and
         // then log the query, bindings, and execution time so we will report them on
@@ -54,7 +74,7 @@ public function __call(string $method, array $parameters)
         // Convert the query parameters to a json string.
         array_walk_recursive($parameters, function (&$item, $key) {
             if ($item instanceof ObjectID) {
-                $item = (string) $item;
+                $item = (string)$item;
             }
         });
 
@@ -67,7 +87,7 @@ public function __call(string $method, array $parameters)
             }
         }
 
-        $queryString = $this->collection->getCollectionName().'.'.$method.'('.implode(',', $query).')';
+        $queryString = $this->collection->getCollectionName() . '.' . $method . '(' . implode(',', $query) . ')';
 
         $this->connection->logQuery($queryString, [], $time);