mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
Fix ALF-10684: FTR: Insufficient hooks provided to allow developers to listen to inbound transfers
- TransferListener objects now receive the correct, useful events when files and folders are created, updated, moved, and deleted. - The processing algorithm has been changed to eliminate (or at least substantially reduce) the risk of a transfer breaking and leaving the filesystem in a "bad" state. NOTE: This commit will make any existing FTR instances obsolete due to a schema change on the receiving end. Any FTR instances currently deployed in the community (4.0.a or 4.0.b) will need to be replaced with a clean FTR deployment and repopulated from the source repository - there is no upgrade path. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32441 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
parent
f3b7e79b1a
commit
424d81afd2
@ -66,7 +66,7 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
|
||||
{
|
||||
endManifest();
|
||||
}
|
||||
catch(Exception ex)
|
||||
catch(Throwable ex)
|
||||
{
|
||||
handleException(null, ex);
|
||||
}
|
||||
@ -81,7 +81,7 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
|
||||
{
|
||||
processNode(node);
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Throwable ex)
|
||||
{
|
||||
handleException(node, ex);
|
||||
}
|
||||
@ -96,7 +96,7 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
|
||||
{
|
||||
processNode(node);
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Throwable ex)
|
||||
{
|
||||
handleException(node, ex);
|
||||
}
|
||||
@ -116,7 +116,7 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
|
||||
{
|
||||
processHeader(header);
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Throwable ex)
|
||||
{
|
||||
handleException(null, ex);
|
||||
}
|
||||
@ -130,7 +130,7 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
|
||||
{
|
||||
startManifest();
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Throwable ex)
|
||||
{
|
||||
handleException(null, ex);
|
||||
}
|
||||
@ -167,7 +167,17 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
|
||||
return receiver.getStagingFolder(transferId);
|
||||
}
|
||||
|
||||
private void handleException(TransferManifestNode node, Exception ex)
|
||||
protected TransferReceiver getReceiver()
|
||||
{
|
||||
return receiver;
|
||||
}
|
||||
|
||||
protected String getTransferId()
|
||||
{
|
||||
return transferId;
|
||||
}
|
||||
|
||||
private void handleException(TransferManifestNode node, Throwable ex)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -178,16 +188,26 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
|
||||
log.debug("Successfully marked transaction for rollback.");
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
catch (Throwable e)
|
||||
{
|
||||
//Nothing really to be done here
|
||||
log.warn("Failed to mark transaction as rollback-only in response to an error", e);
|
||||
}
|
||||
TransferProgressMonitor monitor = receiver.getProgressMonitor();
|
||||
String message = (node != null) ? "Error while processing incoming node " + node.getNodeRef() :
|
||||
"Error processing commit";
|
||||
|
||||
monitor.logException(transferId, message, ex);
|
||||
try
|
||||
{
|
||||
TransferProgressMonitor monitor = receiver.getProgressMonitor();
|
||||
String message = (node != null) ? "Error while processing incoming node " + node.getNodeRef() :
|
||||
"Error processing commit";
|
||||
|
||||
monitor.logException(transferId, message, ex);
|
||||
}
|
||||
catch(Throwable t)
|
||||
{
|
||||
//Nothing really to be done here
|
||||
log.warn("Failed to record exception in transfer log due to an exception", t);
|
||||
}
|
||||
|
||||
//Any non-fatal transfer exception is logged and then skipped - the transfer continues
|
||||
//(albeit with a guaranteed rollback at the end).
|
||||
//A fatal transfer exception is rethrown and causes the transfer to end immediately.
|
||||
@ -195,14 +215,41 @@ public abstract class AbstractManifestProcessorBase implements TransferManifestP
|
||||
//and thrown.
|
||||
if (TransferFatalException.class.isAssignableFrom(ex.getClass()))
|
||||
{
|
||||
callLocalExceptionHandler(node, ex);
|
||||
throw (TransferFatalException)ex;
|
||||
}
|
||||
else if (!TransferException.class.isAssignableFrom(ex.getClass()))
|
||||
{
|
||||
callLocalExceptionHandler(node, ex);
|
||||
throw new TransferFatalException(MSG_ERROR_WHILE_COMMITTING_TRANSFER, ex);
|
||||
}
|
||||
}
|
||||
|
||||
private void callLocalExceptionHandler(TransferManifestNode node, Throwable ex)
|
||||
{
|
||||
try
|
||||
{
|
||||
localHandleException(node, ex);
|
||||
}
|
||||
catch(Throwable t)
|
||||
{
|
||||
//Nothing really to be done here
|
||||
log.warn("Caught and discarded exception thrown from custom exception handler", t);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This method is invoked if an exception or error occurs while processing the manifest.
|
||||
* By default it does nothing, but classes that extend this class can override this to provide
|
||||
* custom clean-up.
|
||||
* @param node
|
||||
* @param ex
|
||||
*/
|
||||
protected void localHandleException(TransferManifestNode node, Throwable ex)
|
||||
{
|
||||
//NO-OP - override to add custom clean-up
|
||||
}
|
||||
|
||||
protected void logComment(String message)
|
||||
{
|
||||
receiver.getProgressMonitor().logComment(transferId, message);
|
||||
|
Loading…
x
Reference in New Issue
Block a user