inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
99766: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99697: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99632: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99437: MNT-11219 and MNT-13533: Merged DEV. V4.1-BUG-FIX (4.1.10) to V4.1-BUG-FIX (4.1.10):
                98490: MNT-11219: Incorrect behavior during alternate replication from multiple repositories.
                    - Pruning has been changed to be done for 'manifestRepositoryId' instead of 'fromRepositoryId', to avoid removals for repositories for which replication has not been initiated. Also the calculation of invasions has been modified to take into account the situation, when the folder is invaded only by one repository (by the source repository, from which this folder has come; MNT-11219). Additionally, the 'expectedChildNodeRefs' initialization was modified to resolve nodes from another repository by path, to avoid comparison of NodeRefs of two different repositories. This modification removes redundant and dangerous pruning. And it is needed for both MNT-11219 and MNT-13533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100493 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-27 22:56:27 +00:00
parent 783c24a2a5
commit accd81fc21
4 changed files with 427 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
source/java/org/alfresco/repo/transfer/RepoTertiaryManifestProcessorImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2010 Alfresco Software Limited.
* Copyright (C) 2009-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -16,18 +16,21 @@
* 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.transfer;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.alfresco.repo.transfer.CorrespondingNodeResolver.ResolvedParentChildPair;
import org.alfresco.repo.transfer.manifest.TransferManifestDeletedNode;
import org.alfresco.repo.transfer.manifest.TransferManifestHeader;
import org.alfresco.repo.transfer.manifest.TransferManifestNormalNode;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.transfer.TransferReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -102,16 +105,90 @@ public class RepoTertiaryManifestProcessorImpl extends AbstractManifestProcessor
//TODO Use more efficient query here.
List<ChildAssociationRef> expectedChildren = node.getChildAssocs();
if (log.isDebugEnabled())
{
log.debug("Checking node in TERTIARY_MANIFEST_PROCESSOR");
}
if ((null != resolvedNodes.resolvedParent) && nodeService.exists(resolvedNodes.resolvedParent))
{
if (log.isTraceEnabled())
{
logInvasionHierarchy(resolvedNodes.resolvedParent, nodeRef, nodeService, log);
}
}
else
{
List<ChildAssociationRef> parentAssocs = nodeService.getParentAssocs(nodeRef);
if (log.isTraceEnabled())
{
logInvasionHierarchy(parentAssocs.iterator().next().getParentRef(), nodeRef, nodeService, log);
}
}
List<NodeRef> expectedChildNodeRefs = new ArrayList<NodeRef>();
Set<Path> expectedChildNodePaths = new HashSet<Path>();
if (log.isDebugEnabled())
{
log.debug("Expected children:");
}
for(ChildAssociationRef ref : expectedChildren)
{
if(log.isDebugEnabled())
{
log.debug("expecting child node" + ref);
log.debug("Expecting child node " + ref);
}
NodeRef childRef = null;
if (nodeService.exists(ref.getChildRef()))
{
childRef = ref.getChildRef();
if (log.isTraceEnabled())
{
logInvasionHierarchy(nodeRef, ref.getChildRef(), nodeService, log);
}
}
else
{
Path parentPath = node.getParentPath();
parentPath = parentPath.subPath(0, (parentPath.size() - 1));
parentPath.append(new Path.ChildAssocElement(ref));
ResolvedParentChildPair resolvedChild = nodeResolver.resolveCorrespondingNode(ref.getChildRef(), ref, parentPath);
if (null != resolvedChild.resolvedChild)
{
childRef = resolvedChild.resolvedChild;
if (log.isDebugEnabled())
{
log.debug("The node has been RESOLVED!");
}
if (log.isTraceEnabled())
{
logInvasionHierarchy(resolvedChild.resolvedParent, resolvedChild.resolvedChild, nodeService, log);
}
}
else
{
if (log.isDebugEnabled())
{
log.debug("The node DOES NOT exist in current repository! Processing will be made by its PATH!");
}
expectedChildNodePaths.add(parentPath);
}
}
if (null != childRef)
{
expectedChildNodeRefs.add(childRef);
}
expectedChildNodeRefs.add(ref.getChildRef());
}
List<ChildAssociationRef> actualChildren = nodeService.getChildAssocs(nodeRef);
@@ -119,19 +196,35 @@ public class RepoTertiaryManifestProcessorImpl extends AbstractManifestProcessor
/**
* For each actual child association
*/
if (log.isDebugEnabled())
{
log.debug("Traversing ACTUAL children:");
}
for(ChildAssociationRef child : actualChildren)
{
log.debug("checking child: " + child);
if(child.isPrimary())
{
if (log.isTraceEnabled())
{
logInvasionHierarchy(child.getParentRef(), child.getChildRef(), nodeService, log);
}
/**
* yes it is a primary assoc
* should it be there ?
*/
NodeRef childNodeRef = child.getChildRef();
if(!expectedChildNodeRefs.contains(childNodeRef))
Path actualChildPath = nodeService.getPath(childNodeRef);
if(!expectedChildNodeRefs.contains(childNodeRef) && !expectedChildNodePaths.contains(actualChildPath))
{
if (log.isDebugEnabled())
{
log.debug("This child IS NOT EXPECTED!");
}
/**
* An unexpected child - if this node has been transferred then
* it may need to be deleted.
@@ -143,10 +236,16 @@ public class RepoTertiaryManifestProcessorImpl extends AbstractManifestProcessor
{
log.debug("an unexpected transferred child node:" + child);
logComment("Transfer sync mode - checking unexpected child node:" + child);
String fromRepositoryId = (String)nodeService.getProperty(childNodeRef, TransferModel.PROP_FROM_REPOSITORY_ID);
String fromRepositoryId = (String) nodeService.getProperty(childNodeRef, TransferModel.PROP_FROM_REPOSITORY_ID);
// Yes this is a transferred node. When syncing we only delete nodes that are "from"
// the system that is transferring to this repo.
if (log.isDebugEnabled())
{
log.debug("'manifestRepositoryId': " + manifestRepositoryId);
}
if(fromRepositoryId != null && manifestRepositoryId != null)
{
if(nodeService.hasAspect(childNodeRef, TransferModel.ASPECT_ALIEN))
@@ -157,19 +256,36 @@ public class RepoTertiaryManifestProcessorImpl extends AbstractManifestProcessor
*/
log.debug("node to be deleted contains alien content so needs to be pruned." + childNodeRef);
logComment("Transfer sync mode - node contains alien content so can't be deleted. " + childNodeRef);
alienProcessor.pruneNode(childNodeRef, fromRepositoryId);
alienProcessor.pruneNode(childNodeRef, manifestRepositoryId);
}
else
{
// Node
log.debug("node not alien");
if(manifestRepositoryId.equalsIgnoreCase(fromRepositoryId))
// Node
if (log.isDebugEnabled())
{
log.debug("Node not alien. Trying to delete the node...");
}
String initialRepositoryId = (String) nodeService.getProperty(childNodeRef, TransferModel.PROP_FROM_REPOSITORY_ID);
if(manifestRepositoryId.equalsIgnoreCase(initialRepositoryId))
{
if (log.isDebugEnabled())
{
log.debug("Replication is initiated from the same repository from which this node was transferred! Deleting");
}
// Yes the manifest repository Id and the from repository Id match.
// Destination node if from the transferring repo and needs to be deleted.
logDeleted(node.getNodeRef(), childNodeRef, nodeService.getPath(childNodeRef).toString());
nodeService.deleteNode(childNodeRef);
log.debug("deleted node:" + childNodeRef);
}
else
{
if (log.isDebugEnabled())
{
log
.debug("It is not an alien, but 'fromRepositoryId' is not equal to the 'manifestRepositoryId'! Cannot delete the foreign node...");
}
}
}
}