Changeset 4412

Timestamp:

11/24/2016 04:15:39 AM (8 years ago)

Author:

tellyworth

Message:

Plugin directory: attempt to work around a race condition or similar caching bug that is preventing sync from completing.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -62 +62 @@
         // Load the API routes.
         add_action( 'rest_api_init', array( __NAMESPACE__ . '\API\Base', 'load_routes' ) );
+
+        // Work around caching issues
+        add_filter( 'pre_option_jetpack_sync_full__started' , array( $this, 'bypass_options_cache' ), 10, 2 );
+        add_filter( 'pre_option_jetpack_sync_full__params' , array( $this, 'bypass_options_cache' ), 10, 2 );
+        add_filter( 'pre_option_jetpack_sync_full__queue_finished' , array( $this, 'bypass_options_cache' ), 10, 2 );
+        add_filter( 'pre_option_jetpack_sync_full__send_started' , array( $this, 'bypass_options_cache' ), 10, 2 );
+        add_filter( 'pre_option_jetpack_sync_full__finished' , array( $this, 'bypass_options_cache' ), 10, 2 );
 
         /*
@@ -633 +640 @@
             $wp_query->query_vars['meta_key'] = '_active_installs';
         }
+    }
+
+    /**
+     * Filter to bypass caching for options critical to Jetpack sync to work around race conditions and other unidentified bugs.
+     * If this works and becomes a permanent solution, it probably belongs elsewhere.
+     */
+    public function bypass_options_cache( $value, $option ) {
+        global $wpdb;
+        $value = $wpdb->get_var( 
+            $wpdb->prepare(
+                "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", 
+                $option
+            )
+        );
+        $value = maybe_unserialize( $value );
+
+        return $value;
     }