Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #7853 from edx/hotfix/2015-04-29

Browse Source 
do garbage collection when dumping memory
This commit is contained in:
Adam
2015-04-29 14:32:16 -04:00
parent 6167b03e98 41a66b521b
commit f740bdbe84
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/xmodule/xmodule/js/src/video/00_sjson.js
View File

@@ -79,7 +79,7 @@ function() {
var captions = getCaptions();
if (startTimes.length !== captions.length) {
throw new Exception("video caption and start time arrays do not match in length");
console.warn("video caption and start time arrays do not match in length");
}
// if end is null, then it's been set to

23
openedx/core/operations.py
View File

@@ -1,14 +1,33 @@
import os
import signal
import tempfile
import gc
from datetime import datetime
from meliae import scanner
def dump_memory(signum, frame):
"""Dump memory stats for the current process to a temp directory. Uses the meliae output format."""
scanner.dump_all_objects('{}/meliae.{}.{}.dump'.format(tempfile.gettempdir(), datetime.now().isoformat(), os.getpid()))
"""
Dump memory stats for the current process to a temp directory.
Uses the meliae output format.
"""
timestamp = datetime.now().isoformat()
format_str = '{}/meliae.{}.{}.{{}}.dump'.format(
tempfile.gettempdir(),
timestamp,
os.getpid(),
)
scanner.dump_all_objects(format_str.format('pre-gc'))
# force garbarge collection
for gen in xrange(3):
gc.collect(gen)
scanner.dump_all_objects(
format_str.format("gc-gen-{}".format(gen))
)
def install_memory_dumper(dump_signal=signal.SIGPROF):