mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

More memory optimizations for the RRD upgrade. Ticket #1758 #2159

Browse Source
This commit is contained in:
smos 2012-03-15 14:47:41 +01:00
parent d6425f7582
commit 56ee96ed9d
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etc/inc/upgrade_config.inc
View File

@ -2041,12 +2041,10 @@ function upgrade_054_to_055() {
$i++;
}
$rrdxml = dump_xml_config_raw($rrdold, "rrd");
file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", $rrdxml);
file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", dump_xml_config_raw($rrdold, "rrd"));
mwexec("$rrdtool restore -f {$g['tmp_path']}/{$xmldumpnew} {$rrddbpath}/{$database} 2>&1");
unset($rrdold);
unset($rrdxmlarray);
}
/* let apinger recreate required files */
setup_gateways_monitor();
@ -2100,10 +2098,7 @@ function upgrade_054_to_055() {
$i++;
}
$rrdxmlarray = migrate_rrd_format($rrdold, $rrdnew);
unset($rrdold);
unset($rrdnew);
file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", dump_xml_config_raw($rrdxmlarray, "rrd"));
file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", dump_xml_config_raw(migrate_rrd_format($rrdold, $rrdnew), "rrd"));
mwexec("$rrdtool restore -f {$g['tmp_path']}/{$xmldumpnew} {$rrddbpath}/{$database} 2>&1");
/* we now have the rrd with the new fields, adjust the size now. */
/* RRA 2 is 60 minutes, RRA 3 is 720 minutes */
@ -2704,12 +2699,8 @@ function upgrade_080_to_081() {
$i++;
}
$rrdxmlarray = migrate_rrd_format($rrdold, $rrdnew);
unset($rrdold);
unset($rrdnew);
file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", dump_xml_config_raw($rrdxmlarray, "rrd"));
file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", dump_xml_config_raw(migrate_rrd_format($rrdold, $rrdnew);, "rrd"));
mwexec("$rrdtool restore -f {$g['tmp_path']}/{$xmldumpnew} {$rrddbpath}/{$database} 2>&1");
unset($rrdxmlarray);
}
enable_rrd_graphing();