mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-15 15:02:20 +00:00
41035: Fix for ALF-15225 - qt.length not performing as expected in search.lib.js 41047: RUSSIAN: Translation updates based on EN r40961 41049: GERMAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720. 41050: SPANISH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720. 41051: FRENCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720. 41052: ITALIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720. 41053: JAPANESE: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720. 41054: DUTCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720. 41055: RUSSIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720. 41061: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console 41063: RUSSIAN: Translation updates based on EN r41033 (encoding fixes) 41064: CHINESE: Translation updates based on EN r41033 41073: ALF-15760: Merged V4.0 to V4.1-BUG-FIX (another lost meta-inf revision) 34416: ALF-12992: Updated weblogic DD for SOLR 41074: ALF-15419 / ALF-14438: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (PARTIAL) 37373: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 36821: ALF-13827 / ALF-14402: Make replicated caches recover from temporary comms failures by flushing when a change in peers is detected - We do not flush caches who replicate via copy (e.g. tickets cache) as these may not be recoverable 37122: ALF-13919 / ALF-14403: Merged DEV to PATCHES/V3.4.6 - Rework of Dmitry's implementation - Uses dynamic HQL query to retrieve JBPM workflow instances by specified query criteria - WorkflowInstancesGet web script no longer has to iterate over every workflow instance in the database! - DB index added to enable efficient querying by string variable - Hibernate tastic! 37188: ALF-13919 / ALF-14403: Worked around HQL polymorphism issues by using explicit variable subclass names in from clause 37204: ALF-13919 / ALF-14403: Fix to date range handling by Dmitry 41077: ALF-10730: Fixed object finder drop-down tree to show parent icon type when icon type not available 41089: ALF-13998: 'No items' error is highlighted in red, even that is not sever error. 41109: Part fix for ALF-11297 Disabled test: test-system-build-test has been removed from the test target dependency list 41118: Fixes: ALF-15765 and related issue ALF-15476: - Corrects merge of r34405 and r40159 - Adds people api to cloud proxy config - Cloud/Global Folder picker sites list now universally shows only those sites the user is a member of. 41119: ALF-15419 / ALF-14438: Merged DEV to V4.1-BUG-FIX 41117: ALF-15419 : CLONE Remove JBPM indexes present from upgrades The schema reference files were updated to contain JBPM_VARIABLEINSTANCE.IDX_VARINST_STRVAL index. 41130: ALF-15590: FSTR transfer of custom content type with parent cm:content fails - Fix by Dmitry 41131: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix - Fix provided by Bitrock 41132: Fix for ALF-14388 - Edit Online option is not supported for '.docm', 'dotm', '.xlsm' files - corrected mimetypes to be lower-case 41150: ALF-13287 Added the handling of UTC represented by "Z" within comparator 41154: Check for authentication errors when validating a ticket, if an error occurs re-authenticate. ALF-15394 41155: ALF-15569: User with '@' symbol in username cannot invite - note: since Ent 4.0.2(+) by default MT is pre-configured but not enabled 41173: Merged V4.1 to V4.1-BUG-FIX 41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1: 41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1: 41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41176: Attempt to debug unit test failure 41181: Store leak in AVMServiceTest.test_ETWOTWO_570() causing unit test failure 41184: ALF-15610: Copy Thai analyzer settings to its many SOLR locations 41194: ALF-11297: re-enable system build tests 41195: ALF-11297 ALF-15807: update activities system build tests after correction of ALF-4832 41201: Fix for ALF-15767 Group query using cm:authorityName 41202: Additional unit tests related to ALF-15731 TYPE:"..." queries no longer work for Lucene on 4.X 41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently - check it makes any difference 41204: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_08_15 to BRANCHES/DEV/V4.1-BUG-FIX: (note: merging as-is ... refactor + unit test fix to follow in next commit) 40926: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually) 40974: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually) 41205: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually) - review and refactor the proposed/merged fix (see previous commit) - fix unit test so that it accounts for previous content (as per the original issue) - also: add missing test to suite and fix that test to work with the new fix (ie. cleanup previous content, else need to account for it) 41210: Part 2: ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups - do not expand authorities for thoses with the ADMINISTRATOR_ROLE as they can read all anyway 41216: ALF-11297: system build tests need a database cleanup before running 41222: ALF-15740, ALF-14744: Update rule firing broken for content created in Explorer - Old code lurking around that used to use the inline editable aspect to detect events handled by the CreateNodeRuleTrigger was removed from OnContentUpdateRuleTrigger and replaced with a check for ASPECT_NO_CONTENT 41223: Added missing swf.languagedir setting to enterprise alfresco-global.properties 41230: GERMAN: Translation updates based on EN rev41099. 41232: SPANISH: Translation updates based on EN rev41099. 41233: FRENCH: Translation updates based on EN rev41099. 41234: ITALIAN: Translation updates based on EN rev41099. 41235: JAPANESE: Translation updates based on EN rev41099. 41236: DUTCH: Translation updates based on EN rev41099. 41237: RUSSIAN: Translation updates based on EN rev41099. 41239: CHINESE: Translation updates based on EN rev41099. 41254: ALF-15628: Avoid edit online (SPP, WRITE_LOCK) clashing with edit offline (CheckOutCheckInService, READ_ONLY_LOCK) - Rationalization of work by Alex Malinovsky - WebDAVMethod.checkNode() now properly checks whether nodes without WebDAV lock info are writeable - CheckOutCheckInService won't allow checkout of a node with an existing WRITE_LOCK by the same user - they must unlock first - Propagation of correct status codes 41264: ALF-15628: Fix CheckOutCheckInService test failures 41265: ALF-15699: Reverse merged the following, thus downgrading us back to swftools 0.9.1 40208: ALF-12831: Upgrade to swftools 0.9.2 41266: Rush'n in some translation updates from Gloria 41267: ALF-15628: Fix compilation problem 41269: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 41224: ALF-14856: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 41268: ALF-15459: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX Merged V4.1-BUG-FIX to V3.4-BUG-FIX 41274: ALF-15608: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 41272: ALF-15567: Allow links to be followed through WebDAV on port 80 using basic auth on XP 41277: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually) - fix test fallout after merge/fix (note: failed for PostgreSQL but not MySQL - although fix was not DB-specific) 41278: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal 41284: ALF-14875: Serialize direct permissions after inherited permissions so that they take precedence in any lookups in permission dialogs 41290: JAPANESE: Translation updates based on EN r41099 Fixes: ALF-14565 41296: ALF-15251 CIFS: Checked out document is not marked as locked in CIFS 41299: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix - Additional fix provided by Bitrock 41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE - do not skip IO Exceptions 41306: Incremented version revision for 4.1.2 41309: ALF-15827: Added FORMACTION, FORMMETHOD and ACTION HTML attributes to grey list to close security hole (updated Surf libs r1136) 41318: ALF-15857: Lucene FTS indexer opens streams to all documents to be indexed in a transaction simultaneously - Now stream opening is delayed until the point where the document is being written to the index 41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking 41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc 41326: ALF-15234: IE 8 or IE9 Download .pps as .ppt -Switched the order of the filename headers to better support non-conforming browsers (rfc 5987). 41330: ALF-14875: Reversed r41284 because it didn't solve the problem in the UI. Kev reviewing. 41332: ALF-10688: Can't deactivate an account when alfrescoNtlm follows another authentication subsystem in the authentication chain - Now, if a account is known to be 'mutable' then the enabled flag is read from the mutable authentication service 41337: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.2) 41336: TransformerDebug: Use debug rather than trace when there are transformers but they are all unavailable. 41339: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal - Found some more cases where this is logged as an ERROR 41342: ALF-11087 (Missing icon file: components\images\filetypes\generic-tag-32.png) 41344: ALF-15863 (* search values): Merged HEAD to V4.1-BUG-FIX (4.1.2) 40849: ALF-12839 "Share - Inconsistency in adding a user or a group into a group" part 2 - Making the users console stop "*" searches, just like the groups console when the min search length is set to larger than 0. 41346: ALF-15237 - REST API Group children lists username for fullName and displayName 41350: Merge V3.4-BUG-FIX to V4.1-BUG-FIX: 41065: Disconnect existing CIFS sessions from the same client when a virtual circuit zero session is opened. ALF-13815 41280: Moved session cleanup config into the base authenticator, added support to passthru/base authentication. ALF-13815 41351: Ported database filesystem changes to fix session disconnect, from V3.4. 41352: Merge V3.4-BUG-FIX to V4.1-BUG-FIX: 41067: Added session disconnect support to the Alfresco CIFS authenticator. ALF-13815. 41281: Added session cleanup support to passthru authenticator, session cleanup config moved to base class. ALF-13815 41353: Update svn:mergeinfo 41355: Fix for ALF-15869 - "Site Content" dashlet shows all documents from all the sites in Alfresco Share - mistakenly did a record-only merge of this from 4.1->4.1.1 41363: Fix for ALF-14875 - Manage permissions shows the permission 'No privileges' for All Other Users - reworked the permissions dialog and permissions panels to correctly handle multiple permissions on a special permissions group such as GROUP_EVERYONE - now correctly gets/sets permissions for GROUP_EVERYONE - this also fixes ALF-12014 - in that it allows custom SiteXYZ permissions to work correctly again also (will need manual backport for 3.4.X though) - removed hacks related to previous attempts to fix the above issue - added lots of comments around relevant sections to add in future refactoring or understanding 41371: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY) 41370: Fix for ALF-12014 - Share - Custom role causes incorrect display of permissions Manual merge of changes to 4.1.2 41399: ALF-13438: java.lang.OutOfMemoryError appears in alfresco log when trying to create few thousands of sites consistently. - The v4.0 parent assocs cache used to store every verion of every node's parent assocs, so as we added a node to 60,000 sites, we retained all previous versions of the user's parent association map - After creating 10,000 sites, the cache size was about 4GB, containing about 2 million parents - Now we use a specialized class that allows an upper limit to be set on the total number of cached parents as well as children. - Because the cache is keyed by node transaction ID, the cache can be non-clustered and non-transactional - Once the average number of parents is more than 8, the cache will drop its oldest entries - ParentAssocsInfo also now uses a compact TreeMap instead of a HashMap 41401: ALF-13438: Small correction 41406: ALF-13438: Fix failing unit tests - Removed unused node.parentAssocsSharedCache and corrected node.childByNameCache not to reference it! - Because parent assocs are cached by transaction ID, we must always invalidate them on an in-transaction version increment 41409: Logging of unexepected errors on FTP 41411: Fix possible FTP data session leak if client mixes PORT and PASV commands. ALF-15126 41412: ALF-15845 : Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily 41415: Fixes: ALF-15649: Removes country locale from files with it hard coded. 41419: ALF-14599: Removed ftp.ipv6.enabled from enterprise overlay and bundles 41426: ALF-15845 Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily Roll back changes to DiskDriver interface in favour of hacking NetworkFile. 41440: JAPANESE: Translation update based on EN r41099 41446: ALF-13091: Remove unecessary bean post processors from sub ssytem context and remove CXF's Jsr250BeanPostProcessor. 41458: RUSSIAN: Further translation updates following linguistic review. 41459: ALF-15897: Revert revision 41446, an attempted fix for ALF-13091 41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151 41506: Merged DEV to V4.1-BUG-FIX 41505: ALF-15879: PostgreSQL: upgrade 2.2.8 (577) -> 3.4.10 (703) -> 4.1.1 (159) failed. - Make dropping "store_id" index and "alf_node_store_id_key" constraint optional in 4.1.1 upgrade script because clean 3.4 has "store_id" index and doesn't have "alf_node_store_id_key" constraint, but 3.4 upgraded from 2.2 has "alf_node_store_id_key" constraint and doesn't have "store_id" index. 41531: Fixed ALF-15687, so that any user (except for Admin) won’t be able to retrieve any other user’s preferences via REST API. Also, updated the preferences controllers for the Post and Delete. 41539: ALF-15899: Inbound email does not support multiple recipient folders - Fix by Dmitry Vaserin 41540: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 40794: Merged DEV to V3.4-BUG-FIX 40793: ALF-13752 Saving Word (mac 2011) documents via CIFS into a folder with Versionable rules on Mac OS X Lion (Fix for 3.4) In ContentDiskDriver.renameFile() was added a check whether a node in the archive. 40806: Fix for ALF-9787 - Hiding sites in Share with permissionsDefinitions.xml [creates a permissions error in the blog portion of the site] 40922: Merged DEV to V3.4-BUG-FIX (reviewed by Frederik) 40488: ALF-13357 : Empty outcome when a timer is invoked A check for transitionName was added to AlfrescoTimer to support custom transitions. 40940: ALF-15696: Remove svnkit.jar - makes the build fail if the version of installed command line svn is 1.7. Using commandline binding for <svn> Ant task to be consistent with other parts of the build. 41066: Various fixes to the database filesystem for session disconnect cleanup. 41068: Updates to the Alfresco filesystem for session cleanup. ALF-13815 41301: Merged PATCHES/V3.4.9 to V3.4-BUG-FIX 40966: ALF-15846 / ALF-15709: OOM on cascading reindex - Avoid buffering of all the affected PATH documents in memory - used the set of 'visited' paths to delay generation to the final flush. 41044: ALF-15847 / ALF-15748: Lucene indexer can make sub-optimal cascade reindex decisions during an LDAP sync. - When a user in 6 groups was removed from a massive group, the massive group was getting cascade reindexed rather than the user - Logic adjusted as follows: For nodes with 5 or less parents, we always cascade reindex the child node. For nodes with more than 5 parents, we cascade reindex the parent node if it has less children than the child has parents. 41395: ALF-15715: Unable to edit properties whilst transformation in progress - Delayed all changes that would potentially lock the parent node row while the thumbnail is generating. - Reorganized RenditionContext to lazily instantiate its destination node. - Changed render destination to use temporary ContentWriter until render is complete. 41396: ALF-15715: Fix for failing unit tests. 41413: Fix for issue where user calendar remote api was generating invalid date searches for user dashlet calendar. 41509: Merged DEV to V3.4-BUG-FIX 41507: ALF-12833: Issues installing Alfresco on WebSphere when the server doesn't have internet access Context-param which Sets "http://apache.org/xml/features/nonvalidating/load-external-dtd" feature on the SAXParser to false if this parameter is false 41510: ALF-15171: After addition of a secondary parent association to a container, not all index paths were being regenerated due to a logic error 41512: ALF-15919: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX 41091: ALF-15723: Merged DEV to PATCHES/V3.4.10 26579: Switch the transformer to use Tika git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
664 lines
24 KiB
Java
664 lines
24 KiB
Java
/*
|
|
* Copyright (C) 2005-2012 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.usage;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
import java.util.concurrent.locks.Lock;
|
|
import java.util.concurrent.locks.ReentrantLock;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.repo.domain.usage.UsageDAO;
|
|
import org.alfresco.repo.domain.usage.UsageDAO.MapHandler;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
|
import org.alfresco.repo.tenant.Tenant;
|
|
import org.alfresco.repo.tenant.TenantAdminService;
|
|
import org.alfresco.repo.tenant.TenantService;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.repo.transaction.TransactionServiceImpl;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.repository.NodeService;
|
|
import org.alfresco.service.cmr.repository.StoreRef;
|
|
import org.alfresco.service.cmr.usage.UsageService;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.alfresco.util.Pair;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.springframework.context.ApplicationEvent;
|
|
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
|
|
|
|
import org.alfresco.repo.node.NodeServicePolicies;
|
|
import org.alfresco.repo.node.NodeServicePolicies.OnCreateNodePolicy;
|
|
import org.alfresco.repo.policy.JavaBehaviour;
|
|
import org.alfresco.repo.policy.PolicyComponent;
|
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
|
|
|
/**
|
|
* User Usage Tracking Component - to allow user usages to be collapsed or re-calculated
|
|
*
|
|
* - used by UserUsageCollapseJob to collapse usage deltas.
|
|
* - used on bootstrap to either clear all usages or (re-)calculate all missing usages.
|
|
*/
|
|
public class UserUsageTrackingComponent extends AbstractLifecycleBean implements NodeServicePolicies.OnCreateNodePolicy
|
|
{
|
|
private static Log logger = LogFactory.getLog(UserUsageTrackingComponent.class);
|
|
|
|
private TransactionServiceImpl transactionService;
|
|
private ContentUsageImpl contentUsageImpl;
|
|
|
|
private NodeService nodeService;
|
|
private UsageDAO usageDAO;
|
|
private UsageService usageService;
|
|
private TenantAdminService tenantAdminService;
|
|
private TenantService tenantService;
|
|
|
|
private StoreRef personStoreRef;
|
|
|
|
private int clearBatchSize = 50;
|
|
private int updateBatchSize = 50;
|
|
|
|
private boolean enabled = true;
|
|
private Lock writeLock = new ReentrantLock();
|
|
|
|
private PolicyComponent policyComponent;
|
|
|
|
/**
|
|
* Spring bean init method
|
|
*/
|
|
public void init()
|
|
{
|
|
if (enabled)
|
|
{
|
|
this.policyComponent.bindClassBehaviour(OnCreateNodePolicy.QNAME, ContentModel.TYPE_PERSON, new JavaBehaviour(this, "onCreateNode"));
|
|
}
|
|
}
|
|
|
|
public void setPolicyComponent(PolicyComponent policyComponent)
|
|
{
|
|
this.policyComponent = policyComponent;
|
|
}
|
|
|
|
public void setTransactionService(TransactionServiceImpl transactionService)
|
|
{
|
|
this.transactionService = transactionService;
|
|
}
|
|
|
|
public void setContentUsageImpl(ContentUsageImpl contentUsageImpl)
|
|
{
|
|
this.contentUsageImpl = contentUsageImpl;
|
|
}
|
|
|
|
public void setPersonStoreUrl(String storeUrl)
|
|
{
|
|
this.personStoreRef = new StoreRef(storeUrl);
|
|
}
|
|
|
|
public void setNodeService(NodeService nodeService)
|
|
{
|
|
this.nodeService = nodeService;
|
|
}
|
|
|
|
public void setUsageDAO(UsageDAO usageDAO)
|
|
{
|
|
this.usageDAO = usageDAO;
|
|
}
|
|
|
|
public void setUsageService(UsageService usageService)
|
|
{
|
|
this.usageService = usageService;
|
|
}
|
|
|
|
public void setTenantAdminService(TenantAdminService tenantAdminService)
|
|
{
|
|
this.tenantAdminService = tenantAdminService;
|
|
}
|
|
|
|
public void setTenantService(TenantService tenantService)
|
|
{
|
|
this.tenantService = tenantService;
|
|
}
|
|
|
|
public void setClearBatchSize(int clearBatchSize)
|
|
{
|
|
this.clearBatchSize = clearBatchSize;
|
|
}
|
|
|
|
public void setUpdateBatchSize(int updateBatchSize)
|
|
{
|
|
this.updateBatchSize = updateBatchSize;
|
|
}
|
|
|
|
public void setEnabled(boolean enabled)
|
|
{
|
|
this.enabled = enabled;
|
|
}
|
|
|
|
public void execute()
|
|
{
|
|
if (enabled == false || transactionService.isReadOnly())
|
|
{
|
|
return;
|
|
}
|
|
|
|
boolean locked = writeLock.tryLock();
|
|
if (locked)
|
|
{
|
|
// collapse usages - note: for MT environment, will collapse for all tenants
|
|
try
|
|
{
|
|
collapseUsages();
|
|
}
|
|
finally
|
|
{
|
|
writeLock.unlock();
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
protected void onBootstrap(ApplicationEvent event)
|
|
{
|
|
// default domain
|
|
bootstrapInternal();
|
|
|
|
if (tenantAdminService.isEnabled())
|
|
{
|
|
List<Tenant> tenants = tenantAdminService.getAllTenants();
|
|
for (Tenant tenant : tenants)
|
|
{
|
|
AuthenticationUtil.runAs(new RunAsWork<Object>()
|
|
{
|
|
public Object doWork() throws Exception
|
|
{
|
|
bootstrapInternal();
|
|
return null;
|
|
}
|
|
}, tenantAdminService.getDomainUser(AuthenticationUtil.getSystemUserName(), tenant.getTenantDomain()));
|
|
}
|
|
}
|
|
}
|
|
|
|
public void bootstrapInternal()
|
|
{
|
|
if (transactionService.isReadOnly())
|
|
{
|
|
return;
|
|
}
|
|
|
|
boolean locked = writeLock.tryLock();
|
|
if (locked)
|
|
{
|
|
try
|
|
{
|
|
if (enabled)
|
|
{
|
|
// enabled - calculate missing usages
|
|
calculateMissingUsages();
|
|
}
|
|
else
|
|
{
|
|
if (clearBatchSize != 0)
|
|
{
|
|
// disabled - remove all usages
|
|
clearAllUsages();
|
|
}
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
writeLock.unlock();
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onCreateNode(ChildAssociationRef childAssocRef)
|
|
{
|
|
if (enabled == true)
|
|
{
|
|
final NodeRef personRef = childAssocRef.getChildRef();
|
|
final String userName = (String) this.nodeService.getProperty(personRef, ContentModel.PROP_USERNAME);
|
|
|
|
if (userName != null)
|
|
{
|
|
RetryingTransactionCallback<Long> updateUserWithUsage = new RetryingTransactionCallback<Long>()
|
|
{
|
|
public Long execute() throws Throwable
|
|
{
|
|
List<String> stores = contentUsageImpl.getStores();
|
|
|
|
Long currentUsage = null;
|
|
|
|
for (String store : stores)
|
|
{
|
|
final StoreRef storeRef = tenantService.getName(new StoreRef(store));
|
|
|
|
Long contentSize = usageDAO.getContentSizeForStoreForUser(storeRef, userName);
|
|
|
|
if (contentSize != null)
|
|
{
|
|
currentUsage = (currentUsage == null ? 0L : currentUsage) + contentSize;
|
|
}
|
|
}
|
|
|
|
if (currentUsage != null && currentUsage > 0L)
|
|
{
|
|
List<Pair<NodeRef, Long>> batchUserUsages = new ArrayList<Pair<NodeRef, Long>>(1);
|
|
batchUserUsages.add(new Pair<NodeRef, Long>(personRef, currentUsage));
|
|
|
|
updateUsages(batchUserUsages);
|
|
}
|
|
|
|
return null;
|
|
}
|
|
};
|
|
|
|
// execute in READ-WRITE txn
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(updateUserWithUsage, false);
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void onShutdown(ApplicationEvent event)
|
|
{
|
|
}
|
|
|
|
|
|
/**
|
|
* Clear content usage for all users that have a usage.
|
|
*/
|
|
private void clearAllUsages()
|
|
{
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("Disabled - clear non-missing user usages ...");
|
|
}
|
|
|
|
final Map<String, NodeRef> users = new HashMap<String, NodeRef>();
|
|
|
|
RetryingTransactionCallback<Object> getUsersWithUsage = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
// get people (users) with calculated usage
|
|
MapHandler userHandler = new MapHandler()
|
|
{
|
|
public void handle(Map<String, Object> result)
|
|
{
|
|
String username = (String)result.get("username");
|
|
String uuid = (String)result.get("uuid");
|
|
|
|
users.put(username, new NodeRef(personStoreRef, uuid));
|
|
}
|
|
};
|
|
usageDAO.getUsersWithUsage(personStoreRef, userHandler);
|
|
|
|
return null;
|
|
}
|
|
};
|
|
|
|
// execute in READ-ONLY txn
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(getUsersWithUsage, true);
|
|
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("Found " + users.size() + " users to clear");
|
|
}
|
|
|
|
int clearCount = 0;
|
|
int batchCount = 0;
|
|
int totalCount = 0;
|
|
|
|
List<NodeRef> batchPersonRefs = new ArrayList<NodeRef>(clearBatchSize);
|
|
for (NodeRef personNodeRef : users.values())
|
|
{
|
|
batchPersonRefs.add(personNodeRef);
|
|
batchCount++;
|
|
totalCount++;
|
|
|
|
if ((batchCount == clearBatchSize) || (totalCount == users.size()))
|
|
{
|
|
int cleared = clearUsages(batchPersonRefs);
|
|
clearCount = clearCount + cleared;
|
|
|
|
batchPersonRefs.clear();
|
|
batchCount = 0;
|
|
}
|
|
}
|
|
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("... cleared non-missing usages for " + clearCount + " users");
|
|
}
|
|
}
|
|
|
|
private int clearUsages(final List<NodeRef> personNodeRefs)
|
|
{
|
|
RetryingTransactionCallback<Integer> clearPersonUsage = new RetryingTransactionCallback<Integer>()
|
|
{
|
|
public Integer execute() throws Throwable
|
|
{
|
|
int clearCount = 0;
|
|
for (NodeRef personNodeRef : personNodeRefs)
|
|
{
|
|
nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, null);
|
|
usageService.deleteDeltas(personNodeRef);
|
|
|
|
if (logger.isTraceEnabled())
|
|
{
|
|
logger.trace("Cleared usage for person ("+ personNodeRef+")");
|
|
}
|
|
|
|
clearCount++;
|
|
}
|
|
return clearCount;
|
|
}
|
|
};
|
|
|
|
// execute in READ-WRITE txn
|
|
return transactionService.getRetryingTransactionHelper().doInTransaction(clearPersonUsage, false);
|
|
}
|
|
|
|
/**
|
|
* Recalculate content usage for all users that have no usage.
|
|
* Required if upgrading an existing Alfresco, for users that have not had their initial usage calculated.
|
|
*/
|
|
private void calculateMissingUsages()
|
|
{
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("Enabled - calculate missing user usages ...");
|
|
}
|
|
|
|
final Map<String, NodeRef> users = new HashMap<String, NodeRef>();
|
|
|
|
RetryingTransactionCallback<Object> getUsersWithoutUsage = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
// get people (users) without calculated usage
|
|
MapHandler userHandler = new MapHandler()
|
|
{
|
|
public void handle(Map<String, Object> result)
|
|
{
|
|
String username = (String)result.get("username");
|
|
String uuid = (String)result.get("uuid");
|
|
|
|
users.put(username, new NodeRef(personStoreRef, uuid));
|
|
}
|
|
};
|
|
|
|
usageDAO.getUsersWithoutUsage(tenantService.getName(personStoreRef), userHandler);
|
|
|
|
return null;
|
|
}
|
|
};
|
|
|
|
// execute in READ-ONLY txn
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(getUsersWithoutUsage, true);
|
|
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("Found " + users.size() + " users to recalculate");
|
|
}
|
|
|
|
int updateCount = 0;
|
|
if (users.size() > 0)
|
|
{
|
|
updateCount = recalculateUsages(users);
|
|
}
|
|
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("... calculated missing usages for " + updateCount + " users");
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Recalculate content usage for given users. Required if upgrading an existing Alfresco, for users that
|
|
* have not had their initial usage calculated. In a future release, could also be called explicitly by
|
|
* a SysAdmin, eg. via a JMX operation.
|
|
*/
|
|
private int recalculateUsages(final Map<String, NodeRef> users)
|
|
{
|
|
final Map<String, Long> currentUserUsages = new HashMap<String, Long>(users.size());
|
|
|
|
RetryingTransactionCallback<Long> calculateCurrentUsages = new RetryingTransactionCallback<Long>()
|
|
{
|
|
public Long execute() throws Throwable
|
|
{
|
|
List<String> stores = contentUsageImpl.getStores();
|
|
|
|
for (String store : stores)
|
|
{
|
|
final StoreRef storeRef = tenantService.getName(new StoreRef(store));
|
|
|
|
if (logger.isTraceEnabled())
|
|
{
|
|
logger.trace("Recalc usages for store=" + storeRef);
|
|
}
|
|
|
|
// get content urls
|
|
MapHandler userContentUrlHandler = new MapHandler()
|
|
{
|
|
public void handle(Map<String, Object> result)
|
|
{
|
|
String owner = (String)result.get("owner");
|
|
String creator = (String)result.get("creator");
|
|
Long contentSize = (Long)result.get("contentSize"); // sum of content size (via join of new style content id)
|
|
|
|
if (contentSize == null)
|
|
{
|
|
contentSize = 0L;
|
|
}
|
|
|
|
if (owner == null)
|
|
{
|
|
owner = creator;
|
|
}
|
|
|
|
Long currentUsage = currentUserUsages.get(owner);
|
|
|
|
if (currentUsage == null)
|
|
{
|
|
currentUsage = 0L;
|
|
}
|
|
|
|
currentUserUsages.put(owner, currentUsage + contentSize);
|
|
}
|
|
};
|
|
|
|
// Query and sum the 'new' style content properties
|
|
usageDAO.getUserContentSizesForStore(storeRef, userContentUrlHandler);
|
|
}
|
|
|
|
return null;
|
|
}
|
|
};
|
|
|
|
// execute in READ-ONLY txn
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(calculateCurrentUsages, true);
|
|
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Usages calculated - start update");
|
|
}
|
|
|
|
int updateCount = 0;
|
|
int batchCount = 0;
|
|
int totalCount = 0;
|
|
|
|
List<Pair<NodeRef, Long>> batchUserUsages = new ArrayList<Pair<NodeRef, Long>>(updateBatchSize);
|
|
|
|
for (Map.Entry<String, NodeRef> user : users.entrySet())
|
|
{
|
|
String userName = user.getKey();
|
|
NodeRef personNodeRef = user.getValue();
|
|
|
|
Long currentUsage = currentUserUsages.get(userName);
|
|
if (currentUsage == null)
|
|
{
|
|
currentUsage = 0L;
|
|
}
|
|
|
|
batchUserUsages.add(new Pair<NodeRef, Long>(personNodeRef, currentUsage));
|
|
batchCount++;
|
|
totalCount++;
|
|
|
|
if ((batchCount == updateBatchSize) || (totalCount == users.size()))
|
|
{
|
|
int updated = updateUsages(batchUserUsages);
|
|
updateCount = updateCount + updated;
|
|
|
|
batchUserUsages.clear();
|
|
batchCount = 0;
|
|
}
|
|
}
|
|
|
|
return totalCount;
|
|
}
|
|
|
|
private int updateUsages(final List<Pair<NodeRef, Long>> userUsages)
|
|
{
|
|
RetryingTransactionCallback<Integer> updateCurrentUsages = new RetryingTransactionCallback<Integer>()
|
|
{
|
|
public Integer execute() throws Throwable
|
|
{
|
|
int updateCount = 0;
|
|
|
|
for (Pair<NodeRef, Long> userUsage : userUsages)
|
|
{
|
|
NodeRef personNodeRef = userUsage.getFirst();
|
|
Long currentUsage = userUsage.getSecond();
|
|
|
|
contentUsageImpl.setUserStoredUsage(personNodeRef, currentUsage);
|
|
usageService.deleteDeltas(personNodeRef);
|
|
|
|
updateCount++;
|
|
}
|
|
return updateCount;
|
|
}
|
|
};
|
|
|
|
// execute in READ-WRITE txn
|
|
return transactionService.getRetryingTransactionHelper().doInTransaction(updateCurrentUsages, false);
|
|
}
|
|
|
|
/**
|
|
* Collapse usages - note: for MT environment, will collapse all tenants
|
|
*/
|
|
private void collapseUsages()
|
|
{
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Collapse usages ...");
|
|
}
|
|
|
|
// Collapse usage deltas (if a person has initial usage set)
|
|
RetryingTransactionCallback<Set<NodeRef>> getUsageNodeRefs = new RetryingTransactionCallback<Set<NodeRef>>()
|
|
{
|
|
public Set<NodeRef> execute() throws Throwable
|
|
{
|
|
// Get distinct candidates
|
|
return usageService.getUsageDeltaNodes();
|
|
}
|
|
};
|
|
|
|
// execute in READ-ONLY txn
|
|
Set<NodeRef> usageNodeRefs = transactionService.getRetryingTransactionHelper().doInTransaction(getUsageNodeRefs, true);
|
|
|
|
int collapseCount = 0;
|
|
for (final NodeRef usageNodeRef : usageNodeRefs)
|
|
{
|
|
Boolean collapsed = AuthenticationUtil.runAs(new RunAsWork<Boolean>()
|
|
{
|
|
public Boolean doWork() throws Exception
|
|
{
|
|
return collapseUsage(usageNodeRef);
|
|
}
|
|
}, tenantAdminService.getDomainUser(AuthenticationUtil.getSystemUserName(), tenantService.getDomain(usageNodeRef.getStoreRef().getIdentifier())));
|
|
|
|
if (collapsed)
|
|
{
|
|
collapseCount++;
|
|
}
|
|
}
|
|
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("... collapsed usages for " + collapseCount + " users");
|
|
}
|
|
}
|
|
|
|
private boolean collapseUsage(final NodeRef usageNodeRef)
|
|
{
|
|
RetryingTransactionCallback<Boolean> collapseUsages = new RetryingTransactionCallback<Boolean>()
|
|
{
|
|
public Boolean execute() throws Throwable
|
|
{
|
|
if (!nodeService.exists(usageNodeRef))
|
|
{
|
|
// Ignore
|
|
return false;
|
|
}
|
|
QName nodeType = nodeService.getType(usageNodeRef);
|
|
|
|
if (nodeType.equals(ContentModel.TYPE_PERSON))
|
|
{
|
|
NodeRef personNodeRef = usageNodeRef;
|
|
String userName = (String)nodeService.getProperty(personNodeRef, ContentModel.PROP_USERNAME);
|
|
|
|
long currentUsage = contentUsageImpl.getUserStoredUsage(personNodeRef);
|
|
if (currentUsage != -1)
|
|
{
|
|
// Collapse the usage deltas
|
|
// Calculate and remove deltas in one go to guard against deletion of
|
|
// deltas from another transaction that have not been included in the
|
|
// calculation
|
|
currentUsage = contentUsageImpl.getUserUsage(personNodeRef, true);
|
|
contentUsageImpl.setUserStoredUsage(personNodeRef, currentUsage);
|
|
|
|
if (logger.isTraceEnabled())
|
|
{
|
|
logger.trace("Collapsed usage: username=" + userName + ", usage=" + currentUsage);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (logger.isWarnEnabled())
|
|
{
|
|
logger.warn("Initial usage for user has not yet been calculated: " + userName);
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
};
|
|
|
|
// execute in READ-WRITE txn
|
|
return transactionService.getRetryingTransactionHelper().doInTransaction(collapseUsages, false);
|
|
}
|
|
}
|