apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

some more fine tuning around corner cases

Browse Source
This commit is contained in:
abhishek 2010-10-28 18:20:24 -07:00
parent f3b4dd8a1c
commit b9cd3e2522
2 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View File

@ -2371,16 +2371,35 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
return true;
}
private void cleanupCertTable(Long mServerId){
CertificateVO cert = _certDao.listAll().get(0);//always 1 record in db
Long mgmtSvrIdForCertJob = null;
if(cert!=null){
mgmtSvrIdForCertJob = cert.getMgmtServerId();
}
if(mgmtSvrIdForCertJob!=null && mgmtSvrIdForCertJob.longValue() == (_clMgr.getId())){
CertificateVO lockedCert = _certDao.acquire(cert.getId());
lockedCert.setMgmtServerId(null);
_certDao.release(lockedCert.getId());
@DB
protected void cleanupCertTable(Long mServerId){
Transaction.currentTxn();
try {
CertificateVO cert = _certDao.listAll().get(0);//always 1 record in db
Long mgmtSvrIdForCertJob = null;
if(cert!=null){
mgmtSvrIdForCertJob = cert.getMgmtServerId();
}
if(mgmtSvrIdForCertJob!=null && mgmtSvrIdForCertJob.longValue() == (_clMgr.getId())){
CertificateVO lockedCert = _certDao.acquire(cert.getId());
if(lockedCert == null){
s_logger.error("Could not acquire lock on certificate table during cleanupCertTable()");
}else{
try{
lockedCert.setMgmtServerId(null);
_certDao.update(cert.getId(), lockedCert);
}catch (Exception e){
s_logger.error("Unable to update record in cert table during cleanupCertTable()",e);
}
finally{
_certDao.release(cert.getId());
}
}
}
} catch (Exception e) {
if(e instanceof IndexOutOfBoundsException){
s_logger.error("Custom certificate record in the db deleted, this should never happen! Insert a new dummy record in the certificate table and restart the management server again");
}
}
}

44
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -5874,6 +5874,8 @@ public class ManagementServerImpl implements ManagementServer {
public String uploadCertificate(UploadCustomCertificateCmd cmd) throws ServerApiException{
try
{
Transaction.currentTxn();
Long certVOId = null;
CertificateVO cert = _certDao.listAll().get(0); //always 1 record in db
if(cert.getMgmtServerId()!=null)
throw new ResourceUnavailableException("Another management server is in the process of custom cert updating");
@ -5887,9 +5889,17 @@ public class ManagementServerImpl implements ManagementServer {
String certificatePath = cmd.getPath();
CertificateVO lockedCert = _certDao.acquire(cert.getId());
//assigned mgmt server id to mark as processing under this ms
Long certVOId = _certDao.persistCustomCertToDb(certificatePath,lockedCert,this.getId());//0 implies failure
_certDao.release(lockedCert.getId());
if(lockedCert == null){
String msg = "Unable to obtain lock on the cert from uploadCertificate()";
s_logger.error(msg);
throw new ResourceUnavailableException(msg);
}else{
try{
certVOId = _certDao.persistCustomCertToDb(certificatePath,lockedCert,this.getId());//0 implies failure
}finally{
_certDao.release(cert.getId());
}
}
if (certVOId!=null && certVOId!=0)
{
//certficate uploaded to db successfully
@ -5941,8 +5951,7 @@ public class ManagementServerImpl implements ManagementServer {
}
}
releaseCertRecord(cert);
releaseCertRecord(cert);
if(updatedCpIdList.size() == cpList.size()){
//success case, all updated
return ("Updated:"+updatedCpIdList.size()+" out of:"+cpList.size()+" console proxies");
@ -5953,7 +5962,7 @@ public class ManagementServerImpl implements ManagementServer {
}
else
{
return null;
throw new ManagementServerException("Unable to persist custom certificate to the cloud db");
}
}catch (Exception e) {
s_logger.warn("Failed to successfully update the cert across console proxies on management server:"+this.getId());
@ -5961,15 +5970,30 @@ public class ManagementServerImpl implements ManagementServer {
throw new ServerApiException(BaseCmd.CUSTOM_CERT_UPDATE_ERROR, e.getMessage());
if(e instanceof ManagementServerException)
throw new ServerApiException(BaseCmd.CUSTOM_CERT_UPDATE_ERROR, e.getMessage());
if(e instanceof IndexOutOfBoundsException){
String msg = "Custom certificate record in the db deleted; this should never happen!";
s_logger.error(msg);
throw new ServerApiException(BaseCmd.CUSTOM_CERT_UPDATE_ERROR, msg);
}
}
return null;
}
private void releaseCertRecord(CertificateVO cert) {
private void releaseCertRecord(CertificateVO cert) throws ResourceUnavailableException {
CertificateVO lockedCertPostPatching = _certDao.acquire(cert.getId());
lockedCertPostPatching.setMgmtServerId(null);//release for other ms
_certDao.update(lockedCertPostPatching.getId(), lockedCertPostPatching);
_certDao.release(lockedCertPostPatching.getId());
if(lockedCertPostPatching == null){
String msg = "Unable to obtain lock on the cert from releaseCertRecord() in uploadCertificate()";
s_logger.error(msg);
}else{
try{
lockedCertPostPatching.setMgmtServerId(null);//release for other ms
_certDao.update(lockedCertPostPatching.getId(), lockedCertPostPatching);
}catch (Exception e){
s_logger.warn("Unable to update record in cert table from releaseCertRecord() during uploadCertificate()",e);
}finally{
_certDao.release(cert.getId());
}
}
}
@Override