etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

further code modularization, extracting redundant code to common methods

This commit is contained in:
abhishek 2010-10-28 16:20:20 -07:00
parent 362e67d724
commit f3b4dd8a1c
3 changed files with 55 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
View File

@ -125,13 +125,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
if(s_logger.isDebugEnabled())
s_logger.debug("Directory: " + strDirectory + " created");
if(dirCreated){
//copy cert to the dir
FileWriter fstream = new FileWriter(filePath);
BufferedWriter out = new BufferedWriter(fstream);
out.write(certificate);
//Close the output stream
out.close();
success = true;
success = copyCertToDirectory(certificate, filePath);
successStr = "Successfully created cert at /etc/cloud/consoleproxy/cert/ from the listener flow for new console proxy starting up";
}
}
@ -145,13 +139,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
}
if (dirExists || dirCreated)
{
//copy cert to the dir
FileWriter fstream = new FileWriter(filePath);
BufferedWriter out = new BufferedWriter(fstream);
out.write(certificate);
//Close the output stream
out.close();
success = true;
success = copyCertToDirectory(certificate, filePath);
successStr = "Successfully created cert at /etc/cloud/consoleproxy/cert/ from the UploadCustomCert cmd flow for existing console proxy";
}
}
@ -174,6 +162,18 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
return new Answer(cmd, success, errorStr!=null?errorStr:successStr);
}
private boolean copyCertToDirectory(String certificate, String filePath) throws IOException {
boolean success;
//copy cert to the dir
FileWriter fstream = new FileWriter(filePath);
BufferedWriter out = new BufferedWriter(fstream);
out.write(certificate);
//Close the output stream
out.close();
success = true;
return success;
}
protected Answer execute(final CheckConsoleProxyLoadCommand cmd) {
return executeProxyLoadScan(cmd, cmd.getProxyVmId(), cmd.getProxyVmName(), cmd.getProxyManagementIp(), cmd.getProxyCmdPort());
}

6
server/src/com/cloud/server/ManagementServer.java
View File

@ -1119,5 +1119,11 @@ public interface ManagementServer {
*/
String[] getHypervisors(ListHypervisorsCmd cmd);
/**
* This method uploads a custom cert to the db, and patches every cpvm with it on the current ms
* @param cmd -- upload certificate cmd
* @return -- returns a string on success
* @throws ServerApiException -- even if one of the console proxy patching fails, we throw back this exception
*/
String uploadCertificate(UploadCustomCertificateCmd cmd) throws ServerApiException;
}

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

@ -47,6 +47,7 @@ import javax.crypto.KeyGenerator;
import javax.crypto.Mac;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import javax.naming.InsufficientResourcesException;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
@ -177,9 +178,12 @@ import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientStorageCapacityException;
import com.cloud.exception.InternalErrorException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.ManagementServerException;
import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.OperationTimedoutException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.exception.StorageUnavailableException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
@ -5872,7 +5876,7 @@ public class ManagementServerImpl implements ManagementServer {
{
CertificateVO cert = _certDao.listAll().get(0); //always 1 record in db
if(cert.getMgmtServerId()!=null)
throw new ServerApiException(BaseCmd.CUSTOM_CERT_UPDATE_ERROR, "Another management server is in the process of custom cert updating");
throw new ResourceUnavailableException("Another management server is in the process of custom cert updating");
if(cert.getUpdated().equalsIgnoreCase("Y")){
if(s_logger.isDebugEnabled())
s_logger.debug("A custom certificate already exists in the DB, will replace it with the new one being uploaded");
@ -5892,12 +5896,18 @@ public class ManagementServerImpl implements ManagementServer {
//get a list of all Console proxies from the cp table
List<ConsoleProxyVO> cpList = _consoleProxyDao.listAll();
if(cpList.size() == 0){
throw new ServerApiException(BaseCmd.CUSTOM_CERT_UPDATE_ERROR, "Unable to find any console proxies in the system for certificate update");
releaseCertRecord(cert);
String msg = "Unable to find any console proxies in the system for certificate update";
s_logger.warn(msg);
throw new ResourceUnavailableException(msg);
}
//get a list of all hosts in host table for type cp
List<HostVO> cpHosts = _hostDao.listByType(com.cloud.host.Host.Type.ConsoleProxy);
if(cpHosts.size() == 0){
throw new ServerApiException(BaseCmd.CUSTOM_CERT_UPDATE_ERROR, "Unable to find any console proxy hosts in the system for certificate update");
releaseCertRecord(cert);
String msg = "Unable to find any console proxy hosts in the system for certificate update";
s_logger.warn(msg);
throw new ResourceUnavailableException(msg);
}
//create a hashmap for fast lookup
Map<String,Long> hostNameToHostIdMap = new HashMap<String, Long>();
@ -5931,21 +5941,37 @@ public class ManagementServerImpl implements ManagementServer {
}
}
CertificateVO lockedCertPostPatching = _certDao.acquire(cert.getId());
lockedCertPostPatching.setMgmtServerId(null);//release for other ms
_certDao.release(lockedCertPostPatching.getId());
return ("Updated:"+updatedCpIdList.size()+" out of:"+cpList.size()+" console proxies");
releaseCertRecord(cert);
if(updatedCpIdList.size() == cpList.size()){
//success case, all updated
return ("Updated:"+updatedCpIdList.size()+" out of:"+cpList.size()+" console proxies");
}else{
//failure case, if even one update fails
throw new ManagementServerException("Updated:"+updatedCpIdList.size()+" out of:"+cpList.size()+" console proxies with successfully updated console proxy ids being:"+updatedCpIdList.toString());
}
}
else
{
return null;
}
} catch (Exception e) {
s_logger.warn("Failed to persist custom certificate to the db");
}catch (Exception e) {
s_logger.warn("Failed to successfully update the cert across console proxies on management server:"+this.getId());
if(e instanceof ResourceUnavailableException)
throw new ServerApiException(BaseCmd.CUSTOM_CERT_UPDATE_ERROR, e.getMessage());
if(e instanceof ManagementServerException)
throw new ServerApiException(BaseCmd.CUSTOM_CERT_UPDATE_ERROR, e.getMessage());
}
return null;
}
private void releaseCertRecord(CertificateVO cert) {
CertificateVO lockedCertPostPatching = _certDao.acquire(cert.getId());
lockedCertPostPatching.setMgmtServerId(null);//release for other ms
_certDao.update(lockedCertPostPatching.getId(), lockedCertPostPatching);
_certDao.release(lockedCertPostPatching.getId());
}
@Override
public String[] getHypervisors(ListHypervisorsCmd cmd) {
String hypers = _configDao.getValue(Config.HypervisorList.key());