L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-42039 Restore: Prevent adding too many form fields at once

Browse Source 
This change relates to the Moodle forms used to select activities
in the restore process.

If you add too many form fields at once, it takes a very long time
during which we can't report progress. But adding fields in smaller
groups takes longer overall, so it's a tough balance. This change
splits the adds into groups of 1,000, reporting progress between each.
This commit is contained in:
sam marshall
2013-10-10 10:56:29 +08:00
committed by Damyon Wiese
parent 370058d8fb
commit 02da69214f
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/util/ui/restore_ui_stage.class.php
+34 -2
View File
@@ -486,6 +486,11 @@ class restore_ui_stage_settings extends restore_ui_stage {
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class restore_ui_stage_schema extends restore_ui_stage {
/**
* @var int Maximum number of settings to add to form at once
*/
const MAX_SETTINGS_BATCH = 1000;
/**
* Schema stage constructor
* @param backup_moodleform $ui
@@ -550,6 +555,12 @@ class restore_ui_stage_schema extends restore_ui_stage {
$tasks = $this->ui->get_tasks();
$courseheading = false;
// Track progress through each stage.
$progress = $this->ui->get_progress_reporter();
$progress->start_progress('Initialise schema stage form', 3);
$progress->start_progress('', count($tasks));
$done = 1;
$allsettings = array();
foreach ($tasks as $task) {
if (!($task instanceof restore_root_task)) {
@@ -576,16 +587,37 @@ class restore_ui_stage_schema extends restore_ui_stage {
}
}
}
// Update progress.
$progress->progress($done++);
}
$progress->end_progress();
// Actually add all the settings that we put in the array.
$form->add_settings($allsettings);
// Add settings for tasks in batches of up to 1000. Adding settings
// in larger batches improves performance, but if it takes too long,
// we won't be able to update the progress bar so the backup might
// time out. 1000 is chosen to balance this.
$numsettings = count($allsettings);
$progress->start_progress('', ceil($numsettings / self::MAX_SETTINGS_BATCH));
$start = 0;
$done = 1;
while($start < $numsettings) {
$length = min(self::MAX_SETTINGS_BATCH, $numsettings - $start);
$form->add_settings(array_slice($allsettings, $start, $length));
$start += $length;
$progress->progress($done++);
}
$progress->end_progress();
// Add the dependencies for all the settings.
$progress->start_progress('', count($allsettings));
$done = 1;
foreach ($allsettings as $settingtask) {
$form->add_dependencies($settingtask[0]);
$progress->progress($done++);
}
$progress->end_progress();
$progress->end_progress();
$this->stageform = $form;
}
return $this->stageform;