From 3b4ed7aa61eff1bf3983b7465a919f3c1ac91afe Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 13 Jan 2012 17:25:32 +0000 Subject: [PATCH] ALF-12273: Merge V4.0-BUG-FIX to HEAD 33119: Merge V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33099: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews. - Polish TransformerDebug - Better config for txt and xlsx to swf 33095: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews. - Improvements to TransformerDebug so that calls to getTransformers use trace rather than debug level logging allowing one to see the wood for the trees 33016: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews. - fix build errors - may not get all of them as not tested on Linux 33005: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews. - Disable transformers if the source txt or xlsx is too large - avoids transforms that don't finish txt limit is 5MB xlsx limit is 1MB - Added a general 2 minute timeout added (ignored by JOD transformers - which already have a 2 minute timeout and OpenOffice transformers - would require more work) - Previous commit already limited txt -> pdf -> png so that only the 1st pdf page was created when creating a doclib icon - Earlier commit already reduced the priority of the background Thread used for transformations so that user interaction did not suffer. 33004: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews. - Added time, size and page limits to transformer configuration to allow one to avoid costly transformations and to stop them if they do occur. Limits avoid a transformer being selected if the source is too large, or make it throw and Exception or discard data after a given time, KBytes read or pages created. - Page limits currently only used by TextToPdfContentTransformer for thumbnail (icon) creation. - Time, Size and Page limits are currently ignored by JodContentTransformer and OpenOfficeContentTransformerWorker once running but the max source size limits may be used to avoid the selection of the transformer in the first place. - TransformerDebug added to be able to see what is going on. A real eye opener! log4j org.alfresco.repo.content.transform.TransformerDebug 32136: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library Reducing the priority of the async thread pool that is used to perform the transformations so that normal activity (and even garbage collection) is not interrupted by transformations. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/content/MimetypesGet.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/content/MimetypesGet.java b/source/java/org/alfresco/repo/web/scripts/content/MimetypesGet.java index 78b4651dff..ddfa5340f5 100644 --- a/source/java/org/alfresco/repo/web/scripts/content/MimetypesGet.java +++ b/source/java/org/alfresco/repo/web/scripts/content/MimetypesGet.java @@ -148,8 +148,8 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon { Map> mtd = new HashMap>(); mtd.put("extractors", getExtractors(mimetype)); - mtd.put("transformFrom", getTransformersFrom(mimetype, mimetypes)); - mtd.put("transformTo", getTransformersTo(mimetype, mimetypes)); + mtd.put("transformFrom", getTransformersFrom(mimetype, -1, mimetypes)); + mtd.put("transformTo", getTransformersTo(mimetype, -1, mimetypes)); details.put(mimetype, mtd); } } @@ -171,7 +171,7 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon } return exts; } - protected List getTransformersFrom(String mimetype, List allMimetypes) + protected List getTransformersFrom(String mimetype, long sourceSize, List allMimetypes) { List transforms = new ArrayList(); for(String toMT : allMimetypes) @@ -179,13 +179,13 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon if(toMT.equals(mimetype)) continue; - String details = getTransformer(mimetype, toMT); + String details = getTransformer(mimetype, sourceSize, toMT); if(details != null) transforms.add(toMT + " = " + details); } return transforms; } - protected List getTransformersTo(String mimetype, List allMimetypes) + protected List getTransformersTo(String mimetype, long sourceSize, List allMimetypes) { List transforms = new ArrayList(); for(String fromMT : allMimetypes) @@ -193,17 +193,17 @@ public class MimetypesGet extends DeclarativeWebScript implements ApplicationCon if(fromMT.equals(mimetype)) continue; - String details = getTransformer(fromMT, mimetype); + String details = getTransformer(fromMT, sourceSize, mimetype); if(details != null) transforms.add(fromMT + " = " + details); } return transforms; } /** Note - for now, only does the best one, not all */ - protected String getTransformer(String from, String to) + protected String getTransformer(String from, long sourceSize, String to) { ContentTransformer ct = contentTransformerRegistry.getTransformer( - from, to, new TransformationOptions() + from, sourceSize, to, new TransformationOptions() ); if(ct == null) return null;