Merge pull request #93 from ydb-platform/fix-backofftype-function

Fixed bug, when function Retry::backoffType always return SlowBackoff

Author: ilyakharev

CHANGELOG.md

@@ -1,4 +1,9 @@
+# 1.8.1
+
+* fixed bug, when function Retry::backoffType always return SlowBackoff
+
 # 1.8.0
+
 * update destructor in MemorySessionPool
 * fixed exception on re-create server nodes
 * fixed key name in createTable function

src/Retry/Retry.php

@@ -78,7 +78,7 @@ public function retry(Closure $closure, bool $idempotent)
         $retryCount = 0;
         $lastException = null;
         while (microtime(true) < $startTime + $this->timeoutMs / 1000) {
-            $this->logger->debug("YDB: Run user function. Retry count: $retryCount. Ms: ".(microtime(true) - $startTime));
+            $this->logger->debug("YDB: Run user function. Retry count: $retryCount. s: ".(microtime(true) - $startTime));
             try {
                 return $closure();
             } catch (Exception $e) {
@@ -89,7 +89,7 @@ public function retry(Closure $closure, bool $idempotent)
                 }
                 $retryCount++;
                 $lastException = $e;
-                $delay = $this->retryDelay($retryCount, $this->backoffType($e))*1000;
+                $delay = $this->retryDelay($retryCount, $this->backoffType(get_class($e)))*1000;
                 usleep($delay);
             }
         }

src/Version.php

@@ -1,4 +1,4 @@
 <?php
 const MAJOR = "1";
 const MINOR = "8";
-const PATCH = "0";
+const PATCH = "1";

tests/RetryOnExceptionTest.php

@@ -69,6 +69,6 @@ private function retryTest(Table $table)
                 1,
                 $tres
             );
-        }, true, new RetryParams(20000));
+        }, true, new RetryParams(2000));
     }
 }