Update retry

Author: ilyakharev

src/Exceptions/SdkException.php

@@ -9,24 +9,58 @@
 class Retry
 {
 
-    /**
-     * @var RetryParams
-     */
-    private $params;
+    protected $timeoutMs;
+
+    protected $slowBackOff;
 
-    public function __construct(?RetryParams $params)
+    protected $fastBackOff;
+
+    public function __construct()
     {
-        if (is_null($params)){
-            $params = new RetryParams();
-        }
-        $this->params = $params;
+        $this->timeoutMs = 2000;
+        $this->fastBackOff = new Backoff(6, 5);
+        $this->slowBackOff = new Backoff(6, 1000);
     }
 
     protected function retryDelay(int $retryCount, Backoff $backoff)
     {
         return $backoff->getBackoffSlotMillis()*(1<<min($retryCount, $backoff->getBackoffCeiling()));
     }
 
+    /**
+     * @param int $timeoutMs
+     */
+    protected function setTimeoutMs(int $timeoutMs): void
+    {
+        $this->timeoutMs = $timeoutMs;
+    }
+
+    /**
+     * @param Backoff $slowBackOff
+     */
+    protected function setSlowBackOff(Backoff $slowBackOff): void
+    {
+        $this->slowBackOff = $slowBackOff;
+    }
+
+    /**
+     * @param Backoff $fastBackOff
+     */
+    protected function setFastBackOff(Backoff $fastBackOff): void
+    {
+        $this->fastBackOff = $fastBackOff;
+    }
+
+    public function withParams(?RetryParams $params): Retry
+    {
+        if (is_null($params)) return $this;
+        $retry = clone $this;
+        if ($params->getTimeoutMs()) $retry->setTimeoutMs($params->getTimeoutMs());
+        if ($params->getFastBackOff()) $retry->setFastBackOff($params->getFastBackOff());
+        if ($params->getSlowBackOff()) $retry->setSlowBackOff($params->getSlowBackOff());
+        return $retry;
+    }
+
     /**
      * @throws NonRetryableException
      * @throws RetryableException
@@ -35,7 +69,7 @@ public function retry(Closure $closure, bool $idempotent){
         $startTime = microtime(true);
         $retryCount = 0;
         $lastException = null;
-        while (microtime(true) < $startTime+$this->params->getTimeoutMs()/1000){
+        while (microtime(true) < $startTime+$this->timeoutMs/1000){
             try {
                 return $closure();
             } catch (RetryableException $e){
@@ -50,5 +84,4 @@ public function retry(Closure $closure, bool $idempotent){
         throw $lastException;
     }
 
-
 }

src/Retry/Retry.php

@@ -11,21 +11,15 @@ class RetryParams
     protected $slowBackOff;
     protected $fastBackOff;
 
-    public function __construct($timeoutMs = 2000, Backoff $fastBackOff = null, Backoff $slowBackOff = null)
+    public function __construct($timeoutMs = null, Backoff $fastBackOff = null, Backoff $slowBackOff = null)
     {
         $this->timeoutMs = $timeoutMs;
-        if (!$fastBackOff){
-            $fastBackOff = new Backoff(6, 5);
-        }
         $this->fastBackOff = $fastBackOff;
-        if (!$slowBackOff){
-            $slowBackOff = new Backoff(6, 1000);
-        }
         $this->slowBackOff = $slowBackOff;
     }
 
     /**
-     * @return int|mixed
+     * @return int|null
      */
     public function getTimeoutMs()
     {

src/Retry/RetryParams.php

@@ -11,6 +11,7 @@
 use YdbPlatform\Ydb\Exceptions\NonRetryableException;
 use YdbPlatform\Ydb\Exceptions\RetryableException;
 use YdbPlatform\Ydb\Exceptions\Ydb\BadSessionException;
+use YdbPlatform\Ydb\Retry\Backoff;
 use YdbPlatform\Ydb\Retry\Retry;
 use YdbPlatform\Ydb\Retry\RetryParams;
 
@@ -51,11 +52,16 @@ class Table
      */
     protected $credentials;
 
+    /**
+     * @var Retry
+     */
+    private $retry;
+
     /**
      * @param Ydb $ydb
      * @param LoggerInterface|null $logger
      */
-    public function __construct(Ydb $ydb, LoggerInterface $logger = null)
+    public function __construct(Ydb $ydb, LoggerInterface $logger = null, Retry &$retry)
     {
         $this->client = new ServiceClient($ydb->endpoint(), [
             'credentials' => $ydb->iam()->getCredentials(),
@@ -69,6 +75,8 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
 
         $this->logger = $logger;
 
+        $this->retry = $retry;
+
         if (empty(static::$session_pool))
         {
             static::$session_pool = new Sessions\MemorySessionPool;
@@ -426,13 +434,20 @@ protected function streamRequest($method, array $data = [])
         return $this->doStreamRequest('Table', $method, $data);
     }
 
+    /**
+     * @param RetryParams $params
+     */
+    public function setRetryParams(RetryParams $params): void
+    {
+        $this->retry = $this->retry->withParams($params);
+    }
+
     /**
      * @throws NonRetryableException
      * @throws RetryableException
      */
     public function retrySession(Closure $userFunc, bool $idempotent = false, RetryParams $params = null){
-        $retry = new Retry($params);
-        return $retry->retry(function () use ($userFunc){
+        return $this->retry->withParams($params)->retry(function () use ($userFunc){
             $sessionId = null;
             try{
                 $session = $this->session();

src/Table.php

@@ -5,7 +5,7 @@
 use Closure;
 use Psr\Log\LoggerInterface;
 use YdbPlatform\Ydb\Exceptions\NonRetryableException;
-use YdbPlatform\Ydb\Exceptions\Ydb\BadSessionException;
+use YdbPlatform\Ydb\Exceptions\RetryableException;
 use YdbPlatform\Ydb\Retry\Retry;
 use YdbPlatform\Ydb\Retry\RetryParams;
 
@@ -70,6 +70,11 @@ class Ydb
      */
     protected $logger;
 
+    /**
+     * @var Retry
+     */
+    protected $retry;
+
     /**
      * @param array $config
      * @param LoggerInterface|null $logger
@@ -93,6 +98,8 @@ public function __construct($config = [], LoggerInterface $logger = null)
             $this->discover();
         }
 
+        $this->retry = new Retry();
+
         $this->logger()->info('YDB: Initialized');
     }
 
@@ -219,7 +226,7 @@ public function table()
     {
         if (!isset($this->table))
         {
-            $this->table = new Table($this, $this->logger);
+            $this->table = new Table($this, $this->logger, $this->retry);
         }
 
         return $this->table;
@@ -263,18 +270,30 @@ public function scripting()
 
         return $this->scripting;
     }
+
     /**
+     * @param RetryParams $params
+     */
+    public function setRetryParams(RetryParams $params): void
+    {
+        $this->retry = $this->retry->withParams($params);
+    }
+
+    /**
+     * @param Closure $userFunc
+     * @param bool $idempotent
+     * @param RetryParams|null $params
+     * @return mixed
      * @throws NonRetryableException
+     * @throws RetryableException
      */
-    public function retry(Closure $userFunc, bool $idempotent = false, RetryParams $params){
-        $retry = new Retry($params);
-        return $retry->retry(function () use ($userFunc){null;
+    public function retry(Closure $userFunc, bool $idempotent = false, RetryParams $params = null){
+        return $this->retry->withParams($params)->retry(function () use ($userFunc){
             try{
                 return $userFunc($this);
             }catch (\Exception $bse){
                 throw $bse;
             }
         }, $idempotent);
-
     }
 }