Changeset 5235

Timestamp:

04/04/2017 06:02:37 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: SVN Watcher: Don't re-register cron jobs on the init hook as it's too race-condititiony under load with Cavalcade.
Instead add a cron job to check the cronjobs are registered correctly, with a single event set to re-add svn watcher jobs when we know it's going to be marked as failed.

See #2678

Location:

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

Files:

• cli/class-svn-watcher.php (modified) (2 diffs)
• jobs/class-manager.php (modified) (5 diffs)

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

@@ -73 +73 @@
                 // Set it again, so if the next request fails, this exception will be thrown again, until the issue is resolved.
                 wp_cache_set( 'get_plugin_changes_between_failed', time(), 'svn-watch', 60 );
+
+                // Check the status of the cronjobs are sane, as the exception will trigger it to be marked as `failed`.
+                wp_schedule_single_event( time() + 30, 'plugin_directory_check_cronjobs' );
 
                 throw new Exception( "Could not fetch plugins.svn logs: " . implode( ', ', $logs['errors'] ) );
@@ -162 +165 @@
         $log = SVN::log( self::SVN_URL, 'HEAD' );
         if ( $log['errors'] || ! $log['log'] ) {
+            // Check the status of the cronjobs are sane, as the exception will trigger it to be marked as `failed`.
+            wp_schedule_single_event( time() + 30, 'plugin_directory_check_cronjobs' );
+
             throw new Exception( "Unable to determine HEAD revision" );
         }

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

@@ -15 +15 @@
     public function __construct() {
         // Register all the cron task handlers.
-        add_action( 'init', array( $this, 'register_cron_tasks' ) );
+        add_action( 'admin_init', array( $this, 'register_cron_tasks' ) );
         add_filter( 'cron_schedules', array( $this, 'register_schedules' ) );
 
@@ -22 +22 @@
         add_action( 'plugin_directory_svn_sync',         array( __NAMESPACE__ . '\SVN_Watcher', 'cron_trigger' ) );
         add_action( 'plugin_directory_update_api_check', array( __NAMESPACE__ . '\API_Update_Updater', 'cron_trigger' ) );
+
+        // A cronjob to check cronjobs
+        add_action( 'plugin_directory_check_cronjobs',   array( $this, 'register_cron_tasks' ) );
 
         // Register the wildcard cron hook tasks.
@@ -35 +38 @@
     public function register_schedules( $schedules ) {
         $schedules['every_30s'] = array( 'interval' => 30, 'display' => 'Every 30 seconds' );
+        $schedules['every_120s'] = array( 'interval' => 120, 'display' => 'Every 120 seconds' );
 
         return $schedules;
@@ -126 +130 @@
     /**
      * Queue all of our cron tasks.
+     *
+     * The jobs are queued for 1 minutes time to avoid recurring job failures from repeating too soon.
      */
-    function register_cron_tasks() {
+    public function register_cron_tasks() {
         if ( ! wp_next_scheduled ( 'plugin_directory_meta_sync' ) ) {
-            wp_schedule_event( time(), 'hourly', 'plugin_directory_meta_sync' );
+            wp_schedule_event( time() + 60, 'hourly', 'plugin_directory_meta_sync' );
         }
         if ( ! wp_next_scheduled ( 'plugin_directory_svn_sync' ) ) {
-            wp_schedule_event( time(), 'every_30s', 'plugin_directory_svn_sync' );
+            wp_schedule_event( time() + 60, 'every_30s', 'plugin_directory_svn_sync' );
         }
         if ( ! wp_next_scheduled ( 'plugin_directory_update_api_check' ) ) {
-            wp_schedule_event( time(), 'hourly', 'plugin_directory_update_api_check' );
+            wp_schedule_event( time() + 60, 'hourly', 'plugin_directory_update_api_check' );
+        }
+        if ( ! wp_next_scheduled ( 'plugin_directory_check_cronjobs' ) ) {
+            wp_schedule_event( time() + 60, 'every_120s', 'plugin_directory_check_cronjobs' );
         }
     }
@@ -149 +158 @@
      * @return array The Cron array passed, unchanged.
      */
-    function register_colon_based_hook_handlers( $cron_array ) {
+    public function register_colon_based_hook_handlers( $cron_array ) {
         $wildcard_cron_tasks = array(
             'import_plugin'      => array( __NAMESPACE__ . '\Plugin_Import', 'cron_trigger' ),