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

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

Browse Source 
68202: Merged PLATFORM1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      65477: ACE-525	- BM-0013: SOAK: v420b214_01: DescriptorService intercepts retrying exception during concurrent start


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:33:27 +00:00
parent 03f7156590
commit 5c6dabfff3
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
View File

@@ -300,34 +300,15 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
// Now listen for future license changes // Now listen for future license changes
licenseService.registerOnLicenseChange(this); licenseService.registerOnLicenseChange(this);
// load the license
RetryingTransactionCallback<Void> loadLicenseCallback = new RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
// Verify license has side effect of loading any new licenses
licenseService.verifyLicense();
return null;
}
};
try try
{ {
helper.doInTransaction(loadLicenseCallback, false, false); // Verify license has side effect of loading any new licenses
licenseService.verifyLicense();
} }
catch (Exception e) catch (LicenseException e)
{ {
// Swallow Licence Exception Here // Swallow Licence Exception Here
if (ExceptionStackUtil.getCause(e, LicenseException.class) != null) // Don't log error: It'll be reported by other means
{
// We found a LicenseException in the bowels
// Don't log error: It'll be reported by other means
}
else
{
// The error here is something else unforeseen
throw e;
}
}; };
} }
@@ -405,7 +386,19 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
{ {
if (currentRepoDescriptor == null) if (currentRepoDescriptor == null)
{ {
currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN); final RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
RetryingTransactionCallback<Void> nopLoadLicense = new RetryingTransactionCallback<Void>()
{
@Override
public Void execute()
{
currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN);
return null;
}
};
txnHelper.doInTransaction(nopLoadLicense, false, false);
} }
} }
} }
@@ -736,8 +729,6 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
}; };
RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper(); RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
txnHelper.setForceWritable(true); txnHelper.setForceWritable(true);
// ALF-19629 - Need to sort out trnsaction retry and do we need to Job Lock?
//txnHelper.doInTransaction(updateLicenseCallback, false, true);
txnHelper.doInTransaction(updateLicenseCallback); txnHelper.doInTransaction(updateLicenseCallback);
} }
} }
@@ -756,9 +747,19 @@ public class DescriptorServiceImpl extends AbstractLifecycleBean
// Make sure that the repo descriptor is updated the first time // Make sure that the repo descriptor is updated the first time
if (currentRepoDescriptor == null) if (currentRepoDescriptor == null)
{ {
currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor( final RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
serverDescriptor, RetryingTransactionCallback<Void> nopLoadLicense = new RetryingTransactionCallback<Void>()
LicenseMode.UNKNOWN); {
@Override
public Void execute()
{
currentRepoDescriptor = currentRepoDescriptorDAO.updateDescriptor(serverDescriptor, LicenseMode.UNKNOWN);
return null;
}
};
txnHelper.setForceWritable(true);
txnHelper.doInTransaction(nopLoadLicense, false, false);
} }
} }
} }