MDL-45574 Backup progress: Can time out with large number of files

When there are many files inside a single resource, it's possible for the backup to time out because it does not report progress while adding entries to the backup_ids table.
mpetrowi · Jun 6, 2014 · e974eef · e974eef
1 parent e7ea6b9
commit e974eef
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/backup/util/dbops/backup_structure_dbops.class.php b/backup/util/dbops/backup_structure_dbops.class.php
@@ -103,7 +103,18 @@ public static function insert_backup_ids_record($backupid, $itemname, $itemid) {
         }
     }
 
-    public static function annotate_files($backupid, $contextid, $component, $filearea, $itemid) {
+    /**
+     * Adds backup id database record for all files in the given file area.
+     *
+     * @param string $backupid Backup ID
+     * @param int $contextid Context id
+     * @param string $component Component
+     * @param string $filearea File area
+     * @param int $itemid Item id
+     * @param \core\progress\base $progress
+     */
+    public static function annotate_files($backupid, $contextid, $component, $filearea, $itemid,
+            \core\progress\base $progress = null) {
         global $DB;
         $sql = 'SELECT id
                   FROM {files}
@@ -120,10 +131,19 @@ public static function annotate_files($backupid, $contextid, $component, $filear
             $sql .= ' AND itemid = ?';
             $params[] = $itemid;
         }
+        if ($progress) {
+            $progress->start_progress('');
+        }
         $rs = $DB->get_recordset_sql($sql, $params);
         foreach ($rs as $record) {
+            if ($progress) {
+                $progress->progress();
+            }
             self::insert_backup_ids_record($backupid, 'file', $record->id);
         }
+        if ($progress) {
+            $progress->end_progress();
+        }
         $rs->close();
     }
 

diff --git a/backup/util/structure/backup_structure_processor.class.php b/backup/util/structure/backup_structure_processor.class.php
@@ -86,7 +86,7 @@ public function process_nested_element(base_nested_element $nested) {
                 foreach ($area as $filearea => $info) {
                     $contextid = !is_null($info->contextid) ? $info->contextid : $this->get_var(backup::VAR_CONTEXTID);
                     $itemid    = !is_null($info->element) ? $info->element->get_value() : null;
-                    backup_structure_dbops::annotate_files($backupid, $contextid, $component, $filearea, $itemid);
+                    backup_structure_dbops::annotate_files($backupid, $contextid, $component, $filearea, $itemid, $this->progress);
                 }
             }
         }