Changeset 2134141

Timestamp:

08/05/2019 10:50:39 AM (7 years ago)

Author:

Will Brownsberger

Message:

4.4.1.1 pretest

Location:

wp-issues-crm/trunk

Files:

• php/entity/class-wic-entity-email-activesync-synch.php (modified) (5 diffs)
• readme.txt (modified) (1 diff)

wp-issues-crm/trunk/php/entity/class-wic-entity-email-activesync-synch.php

@@ -66 +66 @@
             $client = $response['output'];
         }
+
+        // time stamp for connection setup completed -- reporting purposes only -- show connection speed and collect results of this run in inbox
+        $synch_fetch_time = microtime(true);
+        $synch_fetch_time_stamp = floor( $synch_fetch_time );
+        
         WIC_Entity_Email_Cron::log_mail ( "WIC_Entity_Email_ActiveSync_Synch::synch_inbox -- connection initiated for timestamp $synch_fetch_time_stamp -- folder $folder. ");
 
+        // set up temporary table to capture download of message_ids
+        $temporary_table = '';
+        $result = self::create_temporary_staging_table ( $synch_fetch_time_stamp );
+        if ( !$result['response_code'] ) {
+            return $result;
+        } else {
+            $temporary_table = $result['output'];
+        }
+
         // attempt to lock inbox before deciding whether full or partial synch -- this forces wait for last synch to complete and set processing flag in overrun situation
-        self::lock_inbox();
+        self::lock_inbox( $temporary_table );
         
         // get folder from main router  
@@ -87 +101 @@
         }
 
-        WIC_Entity_Email_Cron::log_mail ( "WIC_Entity_Email_ActiveSync_Synch::synch_inbox -- starting with uid_reservation table locked" . ( !$sync_start ? 'full' : 'update/partial'  ) . " synch for $folder. ");
-
-
-        // time stamp for connection setup completed -- reporting purposes only -- show connection speed and collect results of this run in inbox
-        $synch_fetch_time = microtime(true);
-        $synch_fetch_time_stamp = floor( $synch_fetch_time );
-        $num_msgs = false;
+        WIC_Entity_Email_Cron::log_mail ( "WIC_Entity_Email_ActiveSync_Synch::synch_inbox -- starting with inbox table locked" . ( !$sync_start ? 'full' : 'update/partial'  ) . " synch for $folder. ");
+
+
         /*
         *
@@ -99 +109 @@
         *
         */
+        $num_msgs = false;
         // Build the request -- properties requested
         $request = new GetFolderType();
@@ -132 +143 @@
         self::save_stub_log_entry( $folder, $synch_fetch_time_stamp, $num_msgs );
     
-        // set up temporary table to capture download of message_ids
-        $temporary_table = '';
-        $result = self::create_temporary_staging_table ( $synch_fetch_time_stamp );
-        if ( !$result['response_code'] ) {
-            self::unlock_inbox();
-            return $result;
-        } else {
-            $temporary_table = $result['output'];
-        }
-
         // actually go out to activesync and get the records
         $result = self::populate_temporary_staging_table ( $folder, $synch_fetch_time_stamp, $client, $temporary_table, $sync_start );
@@ -517 +518 @@
 
 
-    // don't actually lock inbox; lock the uid_reservation_table which holds back any inbox processing.
-    protected static function lock_inbox () {
-        
-        global $wpdb;
-        $uid_reservation_table = $wpdb->prefix . 'wic_uid_reservation';
+    protected static function lock_inbox ( $temporary_table ) {
+        
+        global $wpdb;
+        $inbox_table = $wpdb->prefix . 'wic_inbox_image';
 
         $locked = $wpdb->query (
             "
-            LOCK TABLES $uid_reservation_table WRITE
-            "
+            LOCK TABLES $inbox_table WRITE, $inbox_table as i2 READ, $temporary_table READ
+            "
         );
         if ( false === $locked ) { 

wp-issues-crm/trunk/readme.txt

@@ -108 +108 @@
 
 == Changelog ==
+= 4.4.1.1 =
+* Further modify locking behavior in ActiveSync inbox synch
 = 4.4.1 =
 * Modify locking behavior in ActiveSync inbox synch to prevent process conflicts in overlapping cron runs for large inboxes