mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
24662: 3.4.1 bug fix branch 24718: Merged V3.3 to V3.4-BUG-FIX 24717: Fix ALF-5555: It is impossible to edit review date from record's details page 24719: Fix for ALF-6106: Error on Check In operation with % symbol (SPP) 24733: Better fix for ALF-6106: Error on Check In operation with % symbol 24734: Fix for ALF-6089: Incorrect order of fields at 'Create Series', 'Create Category' and 'Create Folder' forms The name, title and description fields are now placed in their own group on the server, all other non custom rm fields are put in an 'other' group, the client side config then declares a set for each group and orders them appropriately. 24752: Merged V3.4 to V3.4-BUG-FIX 24751: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY) Restored V3.3-BUG-FIX mergeinfo, somehow truncated in revision 24274 24753: Merged V3.3-BUG-FIX to V3.4-BUG-FIX 23870: Merge Dev to V3.3_BUG_FIX ALF-4243: F5 load-balancer sending regular HTTP requests to Alfresco server causing Faces Servlet to throw java.lang.NullPointerException (MyFaces upgrade to from 1.1.5 to 1.1.7) 23897: Additional fixes and tweaks since introduction of MyFaces 1.1.7 library. 23919: More JSF component id related fixes. 23945: More MyFaces1.1.7 JSF page fix ups 23959: Another MyFaces 1.1.7 dup id issue fixed. 24008: ALF-4243 - Upgraded MyFaces from 1.1.7 to 1.1.8 to fix a bug seen in 1.1.7 - Added handling for the fact that valuebound properties that result in null now cause an exception where-as they were perfectly valid in 1.1.5. 24419: Merge from V3.3 to V3.3-BUG-FIX r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail. 24768: Fixes ALF-6295: Allows MySQL to not be installed via unattended installer invocation 24771: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 24767: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 24765: ALF-6547: fix intermittent test failure (AssetServiceImplTest renameFile/renameFolder) - fallout from ALF-1948 24779: Merge V3.3 to V3.4-BUG-FIX 24497 : ALF-3092 - deployment service - catch Throwable from Begin. 24684 : Merge DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3 23498 : ALF-5498 In Windows XP, placing a Folder with a Name that already Exists Removes all Content of the Existing Folder 24749 : ALF-6174 - Transfer Service fails with double peer assoc custom content type 24766 : ALF-5603 - It is impossible to assign workflow from workflow console to non-admin user 24802: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 24801: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection" - do failed audits in a separate thread (from a thread pool) 24812: Fix ALF-6316: A new "spoof" multivalue text property (cm:tagScopeSummary) is now made available for TagScope nodes when accessed via the getProperty or getProperties operations on the standard node service. The values of this property take the form "<tagname>=<tagcount>". A new interceptor has been added to the node service to do this (TagScopePropertyMethodInterceptor). WQS has been tweaked to make use of this new property, and the now defunct behaviour has been removed. 24820: Work in progress refactoring transaction handling of transfer unit tests. 24822: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 24821: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection" - fix up unit tests 24834: ALF-6468 - Update the scheduled actions folder bootstrap to use localisable names and descriptions, following the normal pattern 24836: Added system property 'system.cache.disableImmutableSharedCaches' (false by default) - Equivalent to disabling Hibernate L2 cache for *immutable* entities - Allows distinction between mutable and immutable cache entries 24850: Fix ALF-6562: Moved property that is used to label the WQS dashlet on the "configure site dashboard" page out of the Slingshot project and into the WQS Share Module project. Corrected its value to "Web Quick Start" rather than "WCM Quick Start". 24857: Merged V3.4 to V3.4-BUG-FIX 24853: Merged V3.3 to V3.4 24852: Fixed ALF-6573 "Incorrect name of subgroups on "Groups" page" 24870: Removed svn:mergeinfo from root 24873: Merged V3.3 to V3.4-BUG-FIX (RECORD ONLY) 21789: ALF-4333: Fix - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter). - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted". - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above. - Added new tests for deletion cases. 23259: Merged HEAD to V3.3 23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share 23346: Brought WebQS module in (including build process but not installer elements yet) 23371: "Simply" added wcmqs to installer 23391: ALF-5367: Copy dlls into tomcat/bin as appropriate. 23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines) 23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations 23515: Merged PATCHES/V3.2.0 to V3.3 23514: ALF-5554: Merged HEAD to V3.2.0 23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on 23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo 23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552) 23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs 23564: ALF-5600: Merged V3.4 to V3.3 23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown) 23586: MERGED V3.4 to V3.3 22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused"" 23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel] 23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call) 23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events. 23630: Backport of installer 23631: Added 64-bit & deployment installers 23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly 23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties 23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated 23709: ALF-5699: Fix NPE in ManifestIntegrationTest 23734: Merged V3.4 to V3.3 23731: Fixes for ALF-3098 and ALF-3097 - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager 23747: ALF-5696: Merged V3.4 to V3.3 23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null" 23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client." 23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails 23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33 22750: ALF-4846: Update rules are firing on inbound actions 23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750) 23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet" - Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions) 24132: Disable intermittent failing unit test 24148: ALF-6007: Merged HEAD to V3.3 23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs) 24263: Merged from V3.3-BUG-FIX to V3.3 24264: V3.3-BUG-FIX to V3.3 24262: Stress test code for ALF-5025: Support background processing of archiving 24287: Added missing import 24336: Merged V3.4 to V3.3 23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent 24353: Merged V3.4 to V3.3 24352: Fix SQL fallout from ALF-6078 24510: Merged V3.4 to V3.3 21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts 21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes. 24526: Merged V3.4 to V3.3 24402: Fix for performance degredation related to ALF-3823. RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. Switched code to use the Java Regex libraries to improve performance and reduce memory usage. 24587: Merged V3.4 to V3.3 24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI 24604: Merged V3.4 to V3.3 24602: Build fix for RM permission model loading - collateral damage for R 24564 24774: Merged BRANCHES/V3.4 to BRANCHES/V3.3: 23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value 24813: Merged BRANCHES/V3.4 to BRANCHES/V3.3: 24750: Limit installer builds to 2 threads 24874: Merged V3.4 to V3.4-BUG-FIX 24667: Resolve ALF-6202 - MT: fix offline edit (Share) 24672: Fixes from Gloria for: ALF-6339 and ALF-6337 24673: Merge V3.3 to V3.4 24668 : Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size 24674: Fixes ALF-6294: Remove illegal CLI option 24675: Fix ALF-6099: CLONE - IE6: Sometimes errors occur on almost actions in Office Add-ins. Removed linebreaks from JSON response template & prevented "undefined" entries in URL. 24680: ALF-6120 : Version notes are lost for versioned items migrated from 2.2 to 3.4.0 24681: Merged BRANCHES/DEV/BELARUS/V3.4-2010_12_14 to BRANCHES/V3.4: 24609: MT - ALF-3563 24640: MT - ALF-3563 (merged w/ minor improvement) 24685: Fixes ALF-6403: Change installer window height on Linux 24688: Fix ALF-6029 (part II) - MT: cannot "Show Folders" for "Data Dictionary" in Afresco Share - part II adds patch and removes workaround 24689: Fixes: ALF-6219 - Incorrectly formatted variable in translation 24691: MT: ALF-3263 - Explorer login now fails with consistent error message ("Unable to login - unknown username/password.") if tenant does not exist or is disabled 24692: Fixes: ALF-6370 and ALF-6225 among others - sweep of FR and DE resource bundles for quote escaping. 24694: Fixes ALF-6424. Erased erroneous equals sign 24695: Fixes: ALF-6320 - removed the country specific portion of the language pack suffixes for French, German and Spanish. This enables speakers of those languages outside of those countries to benefit from the language packs. 24696: Fix for ALF-6299: XSS attack on editing blog post with XSS data in IE6&IE7 24700: Swaps _it_IT for _it to make Italian language pack available to Italian speakers outside of Italy. 24703: Avoid DB2 query failure if someone passes in a made-up UUID - Test RunningActionRestApiTest was making up a long node UUID - DB2 fails to set the parameter with SQLSTATE=22001 24706: Merged V3.4-BUG-FIX to V3.4 24705: Fix for ALF-6365, ALF-6335 24708: Fix ALF-6386: View Details and Edit Metadata icons are incorrect for folder 24709: Missing first/last name handling. 24711: Merged V3.3 to V3.4 24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings) 24713: Fix ALF-5404: It is now possible to configure who receives notifications of "Contact Us" requests by setting a configuration property on the WQS website node, such as "feedbackAssignee.Contact Request=brian" Also added missing Spring MVC source to 3rd Party. 24715: Fix for ALF-6412. OOoDirect always tries to connect to port 8100. Formerly the ooo.port property did not exist for the OOoDirect connector. It was added in r.23182 for the soffice process, but not for the connector bean. Now added for the connector too. 24721: Fix for ALF-6351 - Simple search breaks if override config is used and does not contain new 'repository-search' element 24728: Fixes: ALF-5685 - Incorrect encoding of Japanese Characters 24732: Fixes ALF-6381 and others - calendar strings appearing incorrectly. Problem was an unicode encoded comma preventing the property string being broken up into different days of the weeks or months. 24739: Fix ALF-6545: DB2: SQLCODE=-302, SQLSTATE=22001 (testCreateMultiLingualCategoryRoots) - Shortened Japanese name to 14 characters 24740: Fixes: ALF-6413 (with some translations still pending). 24742: Update readmes. 24744: Merged HEAD to BRANCHES/V3.4: 24137: Fixes: ALF-5642, ALF-3892, ALF-5043 & Brings Add Event dialog in line with other forms in share by disabling the popup validation error box. 24746: Build/test fix: PostgreSQL -AssetServiceImplTest.renameFolder 24755: Merged V3.3 to V3.4 (RECORD ONLY) 21789: ALF-4333: Fix - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter). - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted". - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above. - Added new tests for deletion cases. 23259: Merged HEAD to V3.3 23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share 23346: Brought WebQS module in (including build process but not installer elements yet) 23371: "Simply" added wcmqs to installer 23391: ALF-5367: Copy dlls into tomcat/bin as appropriate. 23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines) 23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations 23515: Merged PATCHES/V3.2.0 to V3.3 23514: ALF-5554: Merged HEAD to V3.2.0 23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on 23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo 23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552) 23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs 23564: ALF-5600: Merged V3.4 to V3.3 23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown) 23586: MERGED V3.4 to V3.3 22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused"" 23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel] 23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call) 23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events. 23630: Backport of installer 23631: Added 64-bit & deployment installers 23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly 23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties 23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated 23709: ALF-5699: Fix NPE in ManifestIntegrationTest 23734: Merged V3.4 to V3.3 23731: Fixes for ALF-3098 and ALF-3097 - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager 23747: ALF-5696: Merged V3.4 to V3.3 23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null" 23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client." 23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails 23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33 - 22750: ALF-4846: Update rules are firing on inbound actions 23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750) 23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet" - Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions) 24132: Disable intermittent failing unit test 24148: ALF-6007: Merged HEAD to V3.3 23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs) 24263: Merged from V3.3-BUG-FIX to V3.3 24264: Merged V3.3-BUG-FIX to V3.3 24262: Stress test code for ALF-5025: Support background processing of archiving 24287: Added missing import 24336: Merged V3.4 to V3.3 23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent 24353: Merged V3.4 to V3.3 24352: Fix SQL fallout from ALF-6078 24510: Merged V3.4 to V3.3 21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts 21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes. 24526: Merged V3.4 to V3.3 24402: Fix for performance degredation related to ALF-3823. RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. Switched code to use the Java Regex libraries to improve performance and reduce memory usage. 24587: Merged V3.4 to V3.3 24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI 24604: Merged V3.4 to V3.3 24602: Build fix for RM permission model loading - collateral damage for R 24564 24775: Merged BRANCHES/V3.3 to BRANCHES/V3.4: (RECORD-ONLY) - already in V3.4 24774: (RECORD-ONLY) Merged BRANCHES/V3.4 to BRANCHES/V3.3: 23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value 24788: Add evaluation use message for OSX installer 24790: Removed svn:mergeinfo on root 24791: Fixed ALF-6560: MIME type not detected (set to application/octet-stream) when content written via FileFolderService - First access of content on a new file (FileFolderService.getWriter) guesses a mimetype - The initial mimetype guess *was* done during create, but that was expensive. - Added unit test to cover regression 24803: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4: 24773: DE bug fixes received from translators 10th Jan. 24776: ES files received from translators 10th Jan 24793: FR files received from translators 10th Jan 24792: IT files received from translators 10th Jan 24804: Temporarily removing Japanese language bundle 24856: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4: 24848: Latest Language updates from Translators 24863: ALF-6029 (MT Share - repo' view after upg) 24880: Merged V3.3 to V3.4-BUG-FIX 24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge) 24465: Merge V3.3 to V3.4 (RECORD ONLY) 24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge) 24493: Fix for Mac OS X CIFS logon problem, change UID to start at one as zero has special meaning, plus other minor fixes. JLAN-112. 24569: Fix for ALF-5333: Webdav - Online editing of files in a folder with German umlauts does not report correct characters 24611: Fix broken build due to merge #fail (r24460 / ALF-4015) 24668: ALF-4557 - Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size 24707: Fix for handling of null first/last name in wiki page list 24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings) 24794: Fix for ALF-4984 - Outdated custom-slingshot-application-context.xml.sample file for share 24798: Fix for ALF-5806: Lucene query does not return expected result. - Alfresco FTS now supports the prefixes ~ and = for phrase queries 24814: Build fix after r24798: Fix for ALF-5806: Lucene query does not return expected result. 24823: Synchronization improvements to RemoteClient and http proxy hosts 24825: Fixed #3 of ALF-6308 "Share data issues" - Share falls back to use "html uploader" (in all browsers except IE) when "JSESSIONID" cookie is unreachable from javascript (like when "HttpOnly cookies" is activated on the server. 24835: Fixed ALF-5484: Check-in does not update association - Copy code when copying over an existing target node was NOT processing associations - Fallout from refactor and subsequent fixes related to ALF-958 (Target associations aren't copied) - Some commented-out unit tests reintroduced 24842: Fix for ALF-6308 item #4 - validate the redirect URL to ensure it is a relative url 24845: Merged DEV/DAVEW/SAP to V3.3 23874: ALF-5822: Correct Lucene throttling mechanism to prevent build up of excessive committed deltas - Also correct BatchProcessor's mechanism for single-threading batches with cross dependencies - Single-threaded batches must be sequenced in order 23876: ALF-5822: Default lucene.indexer.mergerTargetOverlaysBlockingFactor to 2 for better write performance under load 24022: ALF-5822: Refinement of fix - Don't block a thread that has already entered the prepare phase with another indexer (e.g. a cross-store commit). Otherwise it could block indefinitely and never enter the commit phase - Also added extra debug diagnostics and handle all Throwables on failure 24023: ALF-5822: Minor correction to debug log message 24421: ALF-6134: Do not export org.hibernate.jmx.StatisticsService through JMX to avoid excessive blocking under load 24422: ALF-6135: Remove lock contention from concurrent Lucene searches - Added a RW Lock and Thread local-based solution to org.apache.lucene.store.FSDirectory.FSIndexInput.readInternal() to avoid contention during multiple parallel Lucene searches. This is already recognized as a bottleneck by the Lucene developers, who offer NIOFSDirectory as an alternative, which unfortunately doesn't work on Windows. - Added RW lock to org.apache.lucene.index.TermInfosReader.ensureIndexIsRead() - Threads no longer hanging in lucene searches during load tests. Woohoo! 24423: ALF-6136: Don't call through to org.apache.log4j.NDC unless debug is enabled as it's heavily synchronized. Also avoid dynamic method invocation by using a delegate. 24426: ALF-6138 (SURF - PARTIAL): 'Warm' the java.beans.Introspector cache for key Freemarker accessible bean classes on loading in static initializers 24428: ALF-6139 (SURF - PARTIAL): First log in to Share is expensive due to 'lazy' dashboard creation and excessive synchronization - Added AVMRemoteStore.createDocuments() for creating multiple XML documents at once, all embedded within the same master XML document in the request body - Added corresponding saveDocuments() methods to Store, RemoteStore, Model, ModelObjectManager and ModelObjectPersister on the Surf side - Used this in PresetsManager - Removed excessive synchronization from StoreModelObjectPersister 24429: ALF-6140 (SURF - PARTIAL): Surf tweaks to allow concurrent execution of web scripts - Use StrongCacheStorage instead of MruCacheStorage in RepositoryTemplateProcessor to avoid use of a synchronized cache - Tweak cache sizes in FreeMarkerProcessor - Use thread local object wrapper delegates in QNameAwareObjectWrapper and PresentationTemplateProcessor to work around synchronization in DefaultObjectWrapper - Swap in the same object wrapper to WrappingTemplateModel - Use a concurrent HashMap in ModelObjectCache and ModelHelper and remove excessive synchronization - Use RW locks rather than synchronized blocks in AbstractWebScript 24431: ALF-6141: Improvements to IBatis DAO performance under load - Use lazyLoadingEnabled="false", enhancementEnabled="false" to avoid unnecessary blocking and generation of CGI proxies in IBATIS DAOs - Use useTransactionAwareDataSource="false" to prevent Spring from agressively unwrapping DBCP connections and bypassing the prepared statement cache 24432: ALF-6142: Remove dependency between RepositoryAuthenticationDAO and Lucene - Reworked RepositoryAuthenticationDAO to use a node service lookup by child association QName - This required adding a patch to 'upgrade' the qnames of existing authentication nodes, which previously all had the same QName 24433: ALF-6143: Remove net.sf.ehcache.use.classic.lru setting from EhCacheManagerFactoryBean and InternalEhCacheManagerFactoryBean to prevent serialization of accesses to shared caches by multiple executing threads 24434: ALF-6144: DirtySessionMethodInterceptor was causing contention between multiple threads calling the same DAO. - Unfortunately method.getAnnotation() is a synchronized call, and thus causes concurrent calls to the same method to contended with each other. - Added a non-blocking cache so that DAOs can be accessed in multiple threads without contending. 24435: ALF-6145: Use RW Locks in Subsystem Framework - The operations relied on by the dynamic proxies wrapping subsystems were synchronized and thus caused contention when multiple threads were calling in to the same subsystem - Replaced synchronized blocks with use of read write locks, thus allowing multiple concurrent readers 24436: ALF-6146: Regulate PermissionModel accesses with RW locks, rather than synchronized blocks and an excessive number of concurrent hashmaps. 24438: ALF-6136: Fix build classpath 24439: ALF-6142: Fixed seeding of admin user password 24444: ALF-6142: Fix unit test fallout - InviteServiceTest needs a transaction - RepositoryAuthenticationDao must listen for Person username changes and update authentication node qname accordingly - Correction to MT handling in RepositoryAuthenticationDao - Repository Authentication Component must 'normalize' the username before passing it through the DAO 24445: ALF-6145: Correction to lock handling when propagating destroy() events 24446: ALF-6142: Add new dependencies to unit test 24448: ALF-6142: Further fix ups 24461: ALF-6142: Fix unit test 24664: ALF-6408: Prevent possible deadlock during reindexing - waitForHeadOfQueue() now only called in beforeCommit() phase rather than afterCommit() to prevent deadlocking with Lucene throttler - indexes are also flushed beforehand in beforeCommit() so that indexing work can still be parallelized - also prevent potential deadlock caused by clearing of IndexInfo.thisThreadPreparing in a nested transaction 24810: ALF-6653: Use read write lock in Hibernate ReadWriteCache to avoid needless contention on L2 cache reads 24817: ALF-4725: Avoid excessive lock contention in dbcp by upgrading to 1.4 - also upgraded commons pool 24818: ALF-6658: Remove synchronization from LockService - transaction local collections used anyway 24844: ALF-6681: Don't let the PostLookup job stack up in multiple threads - Now only executes in one thread at a time and skips scheduled slots where it is already running 24864: Fix for ALF-5904: Explorer - Space model rights not duplicated when creating a space based on a template - copy service no longer uses hasPermission - added tests for permission copy scenarios with assorted rights - this fix assumed there is nothing special about templates - ie that they should always carry permissions and is the "default" copy behaviour to copy permissions if possible 24865: ALF-6145: Fix failing unit test 24878: ALF-6146: Correction to write lock around requiredPermissionsCache 24881: Increment version revision git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
898 lines
32 KiB
Java
898 lines
32 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.repo.batch;
|
|
|
|
import java.io.PrintWriter;
|
|
import java.io.StringWriter;
|
|
import java.io.Writer;
|
|
import java.text.NumberFormat;
|
|
import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.Date;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.NoSuchElementException;
|
|
import java.util.SortedSet;
|
|
import java.util.TreeSet;
|
|
import java.util.concurrent.ArrayBlockingQueue;
|
|
import java.util.concurrent.ExecutorService;
|
|
import java.util.concurrent.ThreadPoolExecutor;
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
import org.alfresco.error.AlfrescoRuntimeException;
|
|
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper;
|
|
import org.alfresco.repo.transaction.TransactionListenerAdapter;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.util.TraceableThreadFactory;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.springframework.context.ApplicationEventPublisher;
|
|
|
|
/**
|
|
* A <code>BatchProcessor</code> manages the running and monitoring of a potentially long-running transactional batch
|
|
* process. It iterates over a collection, and queues jobs that fire a worker on a batch of members. The queued jobs
|
|
* handle progress / error reporting, transaction delineation and retrying. They are processed in parallel by a pool of
|
|
* threads of a configurable size. The job processing is designed to be fault tolerant and will continue in the event of
|
|
* errors. When the batch is complete a summary of the number of errors and the last error stack trace will be logged at
|
|
* ERROR level. Each individual error is logged at WARN level and progress information is logged at INFO level. Through
|
|
* the {@link BatchMonitor} interface, it also supports the real-time monitoring of batch metrics (e.g. over JMX in the
|
|
* Enterprise Edition).
|
|
*
|
|
* @author dward
|
|
*/
|
|
public class BatchProcessor<T> implements BatchMonitor
|
|
{
|
|
/** The factory for all new threads */
|
|
private TraceableThreadFactory threadFactory;
|
|
|
|
/** The logger to use. */
|
|
private final Log logger;
|
|
|
|
/** The retrying transaction helper. */
|
|
private final RetryingTransactionHelper retryingTransactionHelper;
|
|
|
|
/** The source of the work being done. */
|
|
private BatchProcessWorkProvider<T> workProvider;
|
|
|
|
/** The process name. */
|
|
private final String processName;
|
|
|
|
/** The number of entries to process before reporting progress. */
|
|
private final int loggingInterval;
|
|
|
|
/** The number of worker threads. */
|
|
private final int workerThreads;
|
|
|
|
/** The number of entries we process at a time in a transaction. */
|
|
private final int batchSize;
|
|
|
|
/** The current entry id. */
|
|
private String currentEntryId;
|
|
|
|
/** The number of batches currently executing. */
|
|
private int executingCount;
|
|
|
|
/** What transactions need to be retried?. We do these single-threaded in order to avoid cross-dependency issues */
|
|
private SortedSet<Integer> retryTxns = new TreeSet<Integer>();
|
|
|
|
/** The last error. */
|
|
private Throwable lastError;
|
|
|
|
/** The last error entry id. */
|
|
private String lastErrorEntryId;
|
|
|
|
/** The total number of errors. */
|
|
private int totalErrors;
|
|
|
|
/** The number of successfully processed entries. */
|
|
private int successfullyProcessedEntries;
|
|
|
|
/** The start time. */
|
|
private Date startTime;
|
|
|
|
/** The end time. */
|
|
private Date endTime;
|
|
|
|
/**
|
|
* Instantiates a new batch processor.
|
|
*
|
|
* @param processName
|
|
* the process name
|
|
* @param retryingTransactionHelper
|
|
* the retrying transaction helper
|
|
* @param collection
|
|
* the collection
|
|
* @param workerThreads
|
|
* the number of worker threads
|
|
* @param batchSize
|
|
* the number of entries we process at a time in a transaction
|
|
* @param applicationEventPublisher
|
|
* the application event publisher (may be <tt>null</tt>)
|
|
* @param logger
|
|
* the logger to use (may be <tt>null</tt>)
|
|
* @param loggingInterval
|
|
* the number of entries to process before reporting progress
|
|
*
|
|
* @deprecated Since 3.4, use the {@link BatchProcessWorkProvider} instead of the <tt>Collection</tt>
|
|
*/
|
|
public BatchProcessor(
|
|
String processName,
|
|
RetryingTransactionHelper retryingTransactionHelper,
|
|
final Collection<T> collection,
|
|
int workerThreads, int batchSize,
|
|
ApplicationEventPublisher applicationEventPublisher,
|
|
Log logger,
|
|
int loggingInterval)
|
|
{
|
|
this(
|
|
processName,
|
|
retryingTransactionHelper,
|
|
new BatchProcessWorkProvider<T>()
|
|
{
|
|
boolean hasMore = true;
|
|
public int getTotalEstimatedWorkSize()
|
|
{
|
|
return collection.size();
|
|
}
|
|
public Collection<T> getNextWork()
|
|
{
|
|
// Only return the collection once
|
|
if (hasMore)
|
|
{
|
|
hasMore = false;
|
|
return collection;
|
|
}
|
|
else
|
|
{
|
|
return Collections.emptyList();
|
|
}
|
|
}
|
|
},
|
|
workerThreads, batchSize,
|
|
applicationEventPublisher, logger, loggingInterval);
|
|
}
|
|
|
|
/**
|
|
* Instantiates a new batch processor.
|
|
*
|
|
* @param processName
|
|
* the process name
|
|
* @param retryingTransactionHelper
|
|
* the retrying transaction helper
|
|
* @param workProvider
|
|
* the object providing the work packets
|
|
* @param workerThreads
|
|
* the number of worker threads
|
|
* @param batchSize
|
|
* the number of entries we process at a time in a transaction
|
|
* @param applicationEventPublisher
|
|
* the application event publisher (may be <tt>null</tt>)
|
|
* @param logger
|
|
* the logger to use (may be <tt>null</tt>)
|
|
* @param loggingInterval
|
|
* the number of entries to process before reporting progress
|
|
*
|
|
* @since 3.4
|
|
*/
|
|
public BatchProcessor(
|
|
String processName,
|
|
RetryingTransactionHelper retryingTransactionHelper,
|
|
BatchProcessWorkProvider<T> workProvider,
|
|
int workerThreads, int batchSize,
|
|
ApplicationEventPublisher applicationEventPublisher,
|
|
Log logger,
|
|
int loggingInterval)
|
|
{
|
|
this.threadFactory = new TraceableThreadFactory();
|
|
this.threadFactory.setNamePrefix(processName);
|
|
this.threadFactory.setThreadDaemon(true);
|
|
|
|
this.processName = processName;
|
|
this.retryingTransactionHelper = retryingTransactionHelper;
|
|
this.workProvider = workProvider;
|
|
this.workerThreads = workerThreads;
|
|
this.batchSize = batchSize;
|
|
if (logger == null)
|
|
{
|
|
this.logger = LogFactory.getLog(this.getClass());
|
|
}
|
|
else
|
|
{
|
|
this.logger = logger;
|
|
}
|
|
this.loggingInterval = loggingInterval;
|
|
|
|
// Let the (enterprise) monitoring side know of our presence
|
|
if (applicationEventPublisher != null)
|
|
{
|
|
applicationEventPublisher.publishEvent(new BatchMonitorEvent(this));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public synchronized String getCurrentEntryId()
|
|
{
|
|
return this.currentEntryId;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public synchronized String getLastError()
|
|
{
|
|
if (this.lastError == null)
|
|
{
|
|
return null;
|
|
}
|
|
Writer buff = new StringWriter(1024);
|
|
PrintWriter out = new PrintWriter(buff);
|
|
this.lastError.printStackTrace(out);
|
|
out.close();
|
|
return buff.toString();
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public synchronized String getLastErrorEntryId()
|
|
{
|
|
return this.lastErrorEntryId;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public synchronized String getProcessName()
|
|
{
|
|
return this.processName;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public synchronized int getSuccessfullyProcessedEntries()
|
|
{
|
|
return this.successfullyProcessedEntries;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public synchronized String getPercentComplete()
|
|
{
|
|
int totalResults = this.workProvider.getTotalEstimatedWorkSize();
|
|
int processed = this.successfullyProcessedEntries + this.totalErrors;
|
|
return processed <= totalResults ? NumberFormat.getPercentInstance().format(
|
|
totalResults == 0 ? 1.0F : (float) processed / totalResults) : "Unknown";
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public synchronized int getTotalErrors()
|
|
{
|
|
return this.totalErrors;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public int getTotalResults()
|
|
{
|
|
return this.workProvider.getTotalEstimatedWorkSize();
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public synchronized Date getEndTime()
|
|
{
|
|
return this.endTime;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public synchronized Date getStartTime()
|
|
{
|
|
return this.startTime;
|
|
}
|
|
|
|
/**
|
|
* Invokes the worker for each entry in the collection, managing transactions and collating success / failure
|
|
* information.
|
|
*
|
|
* @param worker
|
|
* the worker
|
|
* @param splitTxns
|
|
* Can the modifications to Alfresco be split across multiple transactions for maximum performance? If
|
|
* <code>true</code>, worker invocations are isolated in separate transactions in batches for
|
|
* increased performance. If <code>false</code>, all invocations are performed in the current
|
|
* transaction. This is required if calling synchronously (e.g. in response to an authentication event in
|
|
* the same transaction).
|
|
* @return the number of invocations
|
|
*/
|
|
@SuppressWarnings("serial")
|
|
public int process(final BatchProcessWorker<T> worker, final boolean splitTxns)
|
|
{
|
|
int count = workProvider.getTotalEstimatedWorkSize();
|
|
synchronized (this)
|
|
{
|
|
this.startTime = new Date();
|
|
if (this.logger.isInfoEnabled())
|
|
{
|
|
if (count >= 0)
|
|
{
|
|
this.logger.info(getProcessName() + ": Commencing batch of " + count + " entries");
|
|
}
|
|
else
|
|
{
|
|
this.logger.info(getProcessName() + ": Commencing batch");
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
// Create a thread pool executor with the specified number of threads and a finite blocking queue of jobs
|
|
ExecutorService executorService = splitTxns && this.workerThreads > 1 ?
|
|
new ThreadPoolExecutor(
|
|
this.workerThreads, this.workerThreads, 0L, TimeUnit.MILLISECONDS,
|
|
new ArrayBlockingQueue<Runnable>(this.workerThreads * this.batchSize * 10)
|
|
{
|
|
// Add blocking behaviour to work queue
|
|
@Override
|
|
public boolean offer(Runnable o)
|
|
{
|
|
try
|
|
{
|
|
put(o);
|
|
}
|
|
catch (InterruptedException e)
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
},
|
|
threadFactory) : null;
|
|
try
|
|
{
|
|
Iterator<T> iterator = new WorkProviderIterator<T>(this.workProvider);
|
|
int id=0;
|
|
List<T> batch = new ArrayList<T>(this.batchSize);
|
|
while (iterator.hasNext())
|
|
{
|
|
batch.add(iterator.next());
|
|
boolean hasNext = iterator.hasNext();
|
|
if (batch.size() >= this.batchSize || !hasNext)
|
|
{
|
|
final TxnCallback callback = new TxnCallback(id++, worker, batch, splitTxns);
|
|
if (hasNext)
|
|
{
|
|
batch = new ArrayList<T>(this.batchSize);
|
|
}
|
|
|
|
if (executorService == null)
|
|
{
|
|
callback.run();
|
|
}
|
|
else
|
|
{
|
|
executorService.execute(callback);
|
|
}
|
|
}
|
|
}
|
|
return count;
|
|
}
|
|
finally
|
|
{
|
|
if (executorService != null)
|
|
{
|
|
executorService.shutdown();
|
|
try
|
|
{
|
|
executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS);
|
|
}
|
|
catch (InterruptedException e)
|
|
{
|
|
}
|
|
}
|
|
synchronized (this)
|
|
{
|
|
reportProgress(true);
|
|
this.endTime = new Date();
|
|
if (this.logger.isInfoEnabled())
|
|
{
|
|
if (count >= 0)
|
|
{
|
|
this.logger.info(getProcessName() + ": Completed batch of " + count + " entries");
|
|
}
|
|
else
|
|
{
|
|
this.logger.info(getProcessName() + ": Completed batch");
|
|
|
|
}
|
|
}
|
|
if (this.totalErrors > 0 && this.logger.isErrorEnabled())
|
|
{
|
|
this.logger.error(getProcessName() + ": " + this.totalErrors
|
|
+ " error(s) detected. Last error from entry \"" + this.lastErrorEntryId + "\"",
|
|
this.lastError);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Reports the current progress.
|
|
*
|
|
* @param last
|
|
* Have all jobs been processed? If <code>false</code> then progress is only reported after the number of
|
|
* entries indicated by {@link #loggingInterval}. If <code>true</code> then progress is reported if this
|
|
* is not one of the entries indicated by {@link #loggingInterval}.
|
|
*/
|
|
private synchronized void reportProgress(boolean last)
|
|
{
|
|
int processed = this.successfullyProcessedEntries + this.totalErrors;
|
|
if (processed % this.loggingInterval == 0 ^ last)
|
|
{
|
|
StringBuilder message = new StringBuilder(100).append(getProcessName()).append(": Processed ").append(
|
|
processed).append(" entries");
|
|
int totalResults = this.workProvider.getTotalEstimatedWorkSize();
|
|
if (totalResults >= processed)
|
|
{
|
|
message.append(" out of ").append(totalResults).append(". ").append(
|
|
NumberFormat.getPercentInstance().format(
|
|
totalResults == 0 ? 1.0F : (float) processed / totalResults)).append(" complete");
|
|
}
|
|
long duration = System.currentTimeMillis() - this.startTime.getTime();
|
|
if (duration > 0)
|
|
{
|
|
message.append(". Rate: ").append(processed * 1000L / duration).append(" per second");
|
|
}
|
|
message.append(". " + this.totalErrors + " failures detected.");
|
|
this.logger.info(message);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* An interface for workers to be invoked by the {@link BatchProcessor}.
|
|
*/
|
|
public interface BatchProcessWorker<T>
|
|
{
|
|
/**
|
|
* Gets an identifier for the given entry (for monitoring / logging purposes).
|
|
*
|
|
* @param entry
|
|
* the entry
|
|
* @return the identifier
|
|
*/
|
|
public String getIdentifier(T entry);
|
|
|
|
/**
|
|
* Callback to allow thread initialization before the work entries are
|
|
* {@link #process(Object) processed}. Typically, this will include authenticating
|
|
* as a valid user and disbling or enabling any system flags that might affect the
|
|
* entry processing.
|
|
*/
|
|
public void beforeProcess() throws Throwable;
|
|
|
|
/**
|
|
* Processes the given entry.
|
|
*
|
|
* @param entry
|
|
* the entry
|
|
* @throws Throwable
|
|
* on any error
|
|
*/
|
|
public void process(T entry) throws Throwable;
|
|
|
|
/**
|
|
* Callback to allow thread cleanup after the work entries have been
|
|
* {@link #process(Object) processed}.
|
|
* Typically, this will involve cleanup of authentication and resetting any
|
|
* system flags previously set.
|
|
* <p/>
|
|
* This call is made regardless of the outcome of the entry processing.
|
|
*/
|
|
public void afterProcess() throws Throwable;
|
|
}
|
|
|
|
/**
|
|
* Adaptor that allows implementations to only implement {@link #process(Object)}
|
|
*/
|
|
public static abstract class BatchProcessWorkerAdaptor<TT> implements BatchProcessWorker<TT>
|
|
{
|
|
/**
|
|
* @return Returns the <code>toString()</code> of the entry
|
|
*/
|
|
public String getIdentifier(TT entry)
|
|
{
|
|
return entry.toString();
|
|
}
|
|
/** No-op */
|
|
public void beforeProcess() throws Throwable
|
|
{
|
|
}
|
|
/** No-op */
|
|
public void afterProcess() throws Throwable
|
|
{
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Small iterator that repeatedly gets the next batch of work from a {@link BatchProcessWorkProvider}
|
|
|
|
* @author Derek Hulley
|
|
*/
|
|
private static class WorkProviderIterator<T> implements Iterator<T>
|
|
{
|
|
private BatchProcessWorkProvider<T> workProvider;
|
|
private Iterator<T> currentIterator;
|
|
|
|
private WorkProviderIterator(BatchProcessWorkProvider<T> workProvider)
|
|
{
|
|
this.workProvider = workProvider;
|
|
}
|
|
|
|
public boolean hasNext()
|
|
{
|
|
boolean hasNext = false;
|
|
if (workProvider == null)
|
|
{
|
|
// The workProvider was exhausted
|
|
hasNext = false;
|
|
}
|
|
else
|
|
{
|
|
if (currentIterator != null)
|
|
{
|
|
// See if there there is any more on this specific iterator
|
|
hasNext = currentIterator.hasNext();
|
|
}
|
|
|
|
// If we don't have a next (remember that the workProvider is still available)
|
|
// go and get more results
|
|
if (!hasNext)
|
|
{
|
|
Collection<T> nextWork = workProvider.getNextWork();
|
|
if (nextWork == null)
|
|
{
|
|
throw new RuntimeException("BatchProcessWorkProvider returned 'null' work: " + workProvider);
|
|
}
|
|
// Check that there are some results at all
|
|
if (nextWork.size() == 0)
|
|
{
|
|
// An empty collection indicates that there are no more results
|
|
workProvider = null;
|
|
currentIterator = null;
|
|
hasNext = false;
|
|
}
|
|
else
|
|
{
|
|
// There were some results, so get a new iterator
|
|
currentIterator = nextWork.iterator();
|
|
hasNext = currentIterator.hasNext();
|
|
}
|
|
}
|
|
}
|
|
return hasNext;
|
|
}
|
|
|
|
public T next()
|
|
{
|
|
if (!hasNext())
|
|
{
|
|
throw new NoSuchElementException();
|
|
}
|
|
return currentIterator.next();
|
|
}
|
|
|
|
public void remove()
|
|
{
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* A callback that invokes a worker on a batch, optionally in a new transaction.
|
|
*/
|
|
class TxnCallback extends TransactionListenerAdapter implements RetryingTransactionCallback<Object>, Runnable
|
|
{
|
|
|
|
/**
|
|
* Instantiates a new callback.
|
|
*
|
|
* @param worker
|
|
* the worker
|
|
* @param batch
|
|
* the batch to process
|
|
* @param splitTxns
|
|
* If <code>true</code>, the worker invocation is made in a new transaction.
|
|
*/
|
|
public TxnCallback(int id, BatchProcessWorker<T> worker, List<T> batch, boolean splitTxns)
|
|
{
|
|
this.id = id;
|
|
this.worker = worker;
|
|
this.batch = batch;
|
|
this.splitTxns = splitTxns;
|
|
}
|
|
|
|
private final int id;
|
|
|
|
/** The worker. */
|
|
private final BatchProcessWorker<T> worker;
|
|
|
|
/** The batch. */
|
|
private final List<T> batch;
|
|
|
|
/** If <code>true</code>, the worker invocation is made in a new transaction. */
|
|
private final boolean splitTxns;
|
|
|
|
/** The total number of errors. */
|
|
private int txnErrors;
|
|
|
|
/** The number of successfully processed entries. */
|
|
private int txnSuccesses;
|
|
|
|
/** The current entry being processed in the transaction */
|
|
private String txnEntryId;
|
|
|
|
/** The last error. */
|
|
private Throwable txnLastError;
|
|
|
|
/** The last error entry id. */
|
|
private String txnLastErrorEntryId;
|
|
|
|
public Object execute() throws Throwable
|
|
{
|
|
reset();
|
|
if (this.batch.isEmpty())
|
|
{
|
|
return null;
|
|
}
|
|
|
|
// Bind this instance to the transaction
|
|
AlfrescoTransactionSupport.bindListener(this);
|
|
|
|
synchronized (BatchProcessor.this)
|
|
{
|
|
if (BatchProcessor.this.logger.isDebugEnabled())
|
|
{
|
|
BatchProcessor.this.logger.debug("RETRY TXNS: " + BatchProcessor.this.retryTxns);
|
|
}
|
|
// If we are retrying after failure, assume there are cross-dependencies and wait for other
|
|
// executing batches to complete
|
|
while (!BatchProcessor.this.retryTxns.isEmpty()
|
|
&& (BatchProcessor.this.retryTxns.first() < this.id || BatchProcessor.this.retryTxns.first() == this.id
|
|
&& BatchProcessor.this.executingCount > 0)
|
|
&& BatchProcessor.this.retryTxns.last() >= this.id)
|
|
{
|
|
if (BatchProcessor.this.logger.isDebugEnabled())
|
|
{
|
|
BatchProcessor.this.logger.debug(Thread.currentThread().getName()
|
|
+ " Recoverable failure: waiting for other batches to complete");
|
|
}
|
|
BatchProcessor.this.wait();
|
|
}
|
|
if (BatchProcessor.this.logger.isDebugEnabled())
|
|
{
|
|
BatchProcessor.this.logger.debug(Thread.currentThread().getName() + " ready to execute");
|
|
}
|
|
BatchProcessor.this.currentEntryId = this.worker.getIdentifier(this.batch.get(0));
|
|
BatchProcessor.this.executingCount++;
|
|
}
|
|
|
|
for (T entry : this.batch)
|
|
{
|
|
this.txnEntryId = this.worker.getIdentifier(entry);
|
|
try
|
|
{
|
|
this.worker.process(entry);
|
|
this.txnSuccesses++;
|
|
}
|
|
catch (Throwable t)
|
|
{
|
|
if (RetryingTransactionHelper.extractRetryCause(t) == null)
|
|
{
|
|
if (BatchProcessor.this.logger.isWarnEnabled())
|
|
{
|
|
BatchProcessor.this.logger.warn(getProcessName() + ": Failed to process entry \""
|
|
+ this.txnEntryId + "\".", t);
|
|
}
|
|
this.txnLastError = t;
|
|
this.txnLastErrorEntryId = this.txnEntryId;
|
|
this.txnErrors++;
|
|
}
|
|
else
|
|
{
|
|
// Next time we retry, we will wait for other executing batches to complete
|
|
throw t;
|
|
}
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
public void run()
|
|
{
|
|
try
|
|
{
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
BatchProcessor.this.logger.error("Failed to cleanup Worker after processing.", e);
|
|
}
|
|
|
|
|
|
final BatchProcessor<T>.TxnCallback callback = this;
|
|
try
|
|
{
|
|
Throwable tt = null;
|
|
worker.beforeProcess();
|
|
try
|
|
{
|
|
BatchProcessor.this.retryingTransactionHelper.doInTransaction(callback, false, splitTxns);
|
|
}
|
|
catch (Throwable t)
|
|
{
|
|
// Keep this and rethrow
|
|
tt = t;
|
|
}
|
|
worker.afterProcess();
|
|
// Throw if there was a processing exception
|
|
if (tt != null)
|
|
{
|
|
throw tt;
|
|
}
|
|
}
|
|
catch (Throwable t)
|
|
{
|
|
// If the callback was in its own transaction, it must have run out of retries
|
|
if (this.splitTxns)
|
|
{
|
|
this.txnLastError = t;
|
|
this.txnLastErrorEntryId = this.txnEntryId;
|
|
this.txnErrors++;
|
|
if (BatchProcessor.this.logger.isWarnEnabled())
|
|
{
|
|
BatchProcessor.this.logger.warn(getProcessName() + ": Failed to process entry \""
|
|
+ BatchProcessor.this.currentEntryId + "\".", t);
|
|
}
|
|
}
|
|
// Otherwise, we have a retryable exception that we should propagate
|
|
else
|
|
{
|
|
if (t instanceof RuntimeException)
|
|
{
|
|
throw (RuntimeException) t;
|
|
}
|
|
if (t instanceof Error)
|
|
{
|
|
throw (Error) t;
|
|
}
|
|
throw new AlfrescoRuntimeException("Transactional error during " + getProcessName(), t);
|
|
}
|
|
}
|
|
|
|
commitProgress();
|
|
}
|
|
|
|
/**
|
|
* Resets the callback state for a retry.
|
|
*/
|
|
private void reset()
|
|
{
|
|
this.txnLastError = null;
|
|
this.txnLastErrorEntryId = null;
|
|
this.txnSuccesses = this.txnErrors = 0;
|
|
}
|
|
|
|
/**
|
|
* Commits progress from this transaction after a successful commit.
|
|
*/
|
|
private void commitProgress()
|
|
{
|
|
synchronized (BatchProcessor.this)
|
|
{
|
|
if (this.txnErrors > 0)
|
|
{
|
|
int processed = BatchProcessor.this.successfullyProcessedEntries + BatchProcessor.this.totalErrors;
|
|
int currentIncrement = processed % BatchProcessor.this.loggingInterval;
|
|
int newErrors = BatchProcessor.this.totalErrors + this.txnErrors;
|
|
// Work out the number of logging intervals we will cross and report them
|
|
int intervals = (this.txnErrors + currentIncrement) / BatchProcessor.this.loggingInterval;
|
|
if (intervals > 0)
|
|
{
|
|
BatchProcessor.this.totalErrors += BatchProcessor.this.loggingInterval - currentIncrement;
|
|
reportProgress(false);
|
|
while (--intervals > 0)
|
|
{
|
|
BatchProcessor.this.totalErrors += BatchProcessor.this.loggingInterval;
|
|
reportProgress(false);
|
|
}
|
|
}
|
|
BatchProcessor.this.totalErrors = newErrors;
|
|
}
|
|
|
|
if (this.txnSuccesses > 0)
|
|
{
|
|
int processed = BatchProcessor.this.successfullyProcessedEntries + BatchProcessor.this.totalErrors;
|
|
int currentIncrement = processed % BatchProcessor.this.loggingInterval;
|
|
int newSuccess = BatchProcessor.this.successfullyProcessedEntries + this.txnSuccesses;
|
|
// Work out the number of logging intervals we will cross and report them
|
|
int intervals = (this.txnSuccesses + currentIncrement) / BatchProcessor.this.loggingInterval;
|
|
if (intervals > 0)
|
|
{
|
|
BatchProcessor.this.successfullyProcessedEntries += BatchProcessor.this.loggingInterval
|
|
- currentIncrement;
|
|
reportProgress(false);
|
|
while (--intervals > 0)
|
|
{
|
|
BatchProcessor.this.successfullyProcessedEntries += BatchProcessor.this.loggingInterval;
|
|
reportProgress(false);
|
|
}
|
|
}
|
|
BatchProcessor.this.successfullyProcessedEntries = newSuccess;
|
|
}
|
|
|
|
if (this.txnLastError != null)
|
|
{
|
|
BatchProcessor.this.lastError = this.txnLastError;
|
|
BatchProcessor.this.lastErrorEntryId = this.txnLastErrorEntryId;
|
|
}
|
|
|
|
reset();
|
|
|
|
// Make sure we don't wait for a failing transaction
|
|
BatchProcessor.this.retryTxns.remove(this.id);
|
|
BatchProcessor.this.notifyAll();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void afterCommit()
|
|
{
|
|
// Wake up any waiting batches
|
|
synchronized (BatchProcessor.this)
|
|
{
|
|
BatchProcessor.this.executingCount--;
|
|
// We do the final notifications in commitProgress so we can handle a transaction ending in a rollback
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void afterRollback()
|
|
{
|
|
// Wake up any waiting batches
|
|
synchronized (BatchProcessor.this)
|
|
{
|
|
BatchProcessor.this.executingCount--;
|
|
BatchProcessor.this.retryTxns.add(this.id);
|
|
BatchProcessor.this.notifyAll();
|
|
}
|
|
}
|
|
}
|
|
}
|