Changeset 10972 for sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/class-trac.php

Timestamp:

05/14/2021 12:49:21 AM (4 years ago)

Author:

dd32

Message:

Trac: GitHub PRs: Increase API timeouts and add retries to the Trac API.

This is an attempt at avoiding API errors that occur when trac is unavailable, and where there's the potential that a Trac comment might not be added when required.

File:

• sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/class-trac.php (modified) (4 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/class-trac.php

@@ -42 +42 @@
 
         try {
+            // Retrying this is safe, as the `_ts` parameter must be set correctly for it to succeed.
             $this->api( 'ticket.update', [ $id, $comment, $attr, (bool) $notify, $author, $when ] );
 
             return true;
         } catch( \Exception $e ) {
-            // Try once more.. `_ts` may have been outdated.
+            // `_ts` may have been outdated, update and try again.
             if ( isset( $get ) && $attr['_ts'] === $get['_ts'] ) {
                 $get = $this->get( $id ); // refetch the ticket.
-                $attr['_ts'] = $get['_ts'];
+                if ( $attr['_ts'] === $get['_ts'] ) {
+                    // Didn't change, api already retried, throw it.
+                    throw $e;
+                }
+
                 try {
+                    $attr['_ts'] = $get['_ts'];
 
                     $this->api( 'ticket.update', [ $id, $comment, $attr, (bool) $notify, $author, $when ] );
@@ -58 +64 @@
                 }
             }
+
             return false;
         }
@@ -89 +96 @@
      * Fetch/POST a Trac JSONRPC endpoint.
      */
-    public function api( $method, $params ) {
+    public function api( $method, $params, $retry = 3 ) {
+        $tries = 0;
+        $retry = (int) $retry;
+
+        do {
+            try {
+                return $this->_api( $method, $params ); 
+            } catch( \Exception $e ) {
+                // Retry with a short delay
+                sleep( 1 );
+            }
+        } while ( ++$tries < $retry );
+
+        // If we make it this far, all retries have failed, throw that exception.
+        throw $e;
+    }
+
+    protected function _api( $method, $params ) {
         $context = stream_context_create( [ 'http' => [
             'method'        => 'POST',
             'user_agent'    => 'WordPress.org Trac; trac.WordPress.org',
             'max_redirects' => 0,
-            'timeout'       => 5,
+            'timeout'       => 30,
             'ignore_errors' => true,
             'header'        =>
@@ -140 +164 @@
             'user_agent'    => 'WordPress.org Trac; trac.WordPress.org',
             'max_redirects' => 0,
-            'timeout'       => 5,
+            'timeout'       => 30,
             'ignore_errors' => true,
             'header'        =>  [