Changeset 10293 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php

Timestamp:

09/29/2020 12:37:30 AM (4 years ago)

Author:

dd32

Message:

Plugin Directory: Search: Retry search queries when a API->ES timeout is encountered.

The volume of affected queries is low, but high enough that it's annoying on WordPress.org error logging.
This simply retries the query when the error rates are low (ie. ES is probably not unresponsive/overloaded, and the network isn't having issues) which means this shouldn't exacerbate any real errors.

Hopefully quietens the PHP Warnings related to Search timeouts, and fixes search results for the 1 in a million end-users who we didn't have a stale cache for.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php

@@ -194 +194 @@
      */
     protected function error_volume_is_low() {
-        // This cache key keeps a global-ish count of recent errors (per memcache instance).
+        // This cache key keeps a global-ish count of recent errors.
         // Used for random exponential backoff when errors start to pile up, as they will if there is a network outage for example.
         $error_volume = max( $this->get_error_volume(), 0 ); // >= 0
@@ -251 +251 @@
             // If the error volume is high, there's a proportionally lower chance that we'll actually attempt to hit the API.
             if ( $this->error_volume_is_low() ) {
-                $request = wp_remote_post( $service_url, array(
+                $service_args = array(
                     'headers'    => array(
                         'Content-Type' => 'application/json',
@@ -258 +258 @@
                     'user-agent' => 'WordPress.org/jetpack_search',
                     'body'       => $json_es_args,
-                ) );
+                );
+                $request = wp_remote_post( $service_url, $service_args );
             } else {
                 trigger_error( 'Plugin directory search: skipping search due to high error volume', E_USER_WARNING );
                 // Hopefully we still have a cached response to return
                 return $response;
+            }
+
+            // Retry 400 responses if the error volume is still low.
+            // These 400's are not bad requests but rather timeouts between the API and ES
+            if ( 400 === wp_remote_retrieve_response_code( $request ) ) {
+                // Bump the error counter
+                $this->increment_error_volume();
+
+                if ( $this->error_volume_is_low() ) {
+                    $request = wp_remote_post( $service_url, $service_args );
+                }
             }