add retryCondition to RetryDomainsMiddleware

Author: lihsai0

src/Qiniu/Http/Middleware/RetryDomainsMiddleware.php

@@ -16,14 +16,29 @@ class RetryDomainsMiddleware implements Middleware
      */
     private $maxRetryTimes;
 
+    /**
+     * @var callable args response and request; returns bool; If true will retry with backup domains.
+     */
+    private $retryCondition;
+
     /**
      * @param array<string> $backupDomains
      * @param numeric $maxRetryTimes
      */
-    public function __construct($backupDomains, $maxRetryTimes = 2)
+    public function __construct($backupDomains, $maxRetryTimes = 2, $retryCondition = null)
     {
         $this->backupDomains = $backupDomains;
         $this->maxRetryTimes = $maxRetryTimes;
+        $this->retryCondition = $retryCondition;
+    }
+
+    private function shouldRetry($resp, $req)
+    {
+        if (is_callable($this->retryCondition)) {
+            return call_user_func($this->retryCondition, $resp, $req);
+        }
+
+        return !$resp || !$resp->ok();
     }
 
     /**
@@ -46,7 +61,7 @@ public function send($request, $next)
 
                 $retriedTimes += 1;
 
-                if ($response->ok()) {
+                if (!$this->shouldRetry($response, $request)) {
                     return $response;
                 }
             }

src/Qiniu/Region.php

@@ -184,7 +184,12 @@ public static function queryRegion($ak, $bucket, $ucHost = null, $backupUcHosts
         $reqOpt->middlewares = array(
             new RetryDomainsMiddleware(
                 $backupUcHosts,
-                $retryTimes
+                $retryTimes,
+                function ($resp) {
+                    // 612 is app/accesskey is not found
+                    // 631 is no such bucket
+                    return !$resp->ok() && !in_array($resp->statusCode, array(612, 631));
+                }
             )
         );
         $ret = Client::Get($url, array(), $reqOpt);

tests/Qiniu/Tests/MiddlewareTest.php

@@ -120,4 +120,41 @@ public function testSendWithRetryDomains()
         $this->assertEquals($expectRecords, $orderRecorder);
         $this->assertEquals(200, $response->statusCode);
     }
+
+    public function testSendFailFastWithRetryDomains()
+    {
+        $orderRecorder = array();
+
+        $reqOpt = new RequestOptions();
+        $reqOpt->middlewares = array(
+            new Middleware\RetryDomainsMiddleware(
+                array(
+                    "unavailable.phpsdk.qiniu.com",
+                    "qiniu.com",
+                ),
+                3,
+                function () {
+                    return false;
+                }
+            ),
+            new RecorderMiddleware($orderRecorder, "rec")
+        );
+
+        $request = new Request(
+            "GET",
+            "https://fake.phpsdk.qiniu.com/index.html",
+            array(),
+            null,
+            $reqOpt
+        );
+        $response = Client::sendRequestWithMiddleware($request);
+
+        $expectRecords = array(
+            //  'fake.phpsdk.qiniu.com' will fail fast
+            'bef_rec0',
+            'aft_rec1'
+        );
+        $this->assertEquals($expectRecords, $orderRecorder);
+        $this->assertEquals(-1, $response->statusCode);
+    }
 }