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

bug 7519 : extract functionality - changing it to support http protocol. Making the URL's robust against the start and stop of agent on ssvm.

This commit is contained in:
nit 2010-12-23 15:08:46 +05:30
parent 7c44823a2e
commit 1f4cb9b11e
2 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
core/src/com/cloud/storage/template/UploadManagerImpl.java
View File

@ -156,6 +156,7 @@ public class UploadManagerImpl implements UploadManager {
private String parentDir;
private Adapters<Processor> _processors;
private String publicTemplateRepo;
private String extractMountPoint = "/mnt/SecStorage/extractmnt";
private StorageLayer _storage;
private int installTimeoutPerGig;
private boolean _sslCopy;
@ -332,7 +333,7 @@ public class UploadManagerImpl implements UploadManager {
// Create the directory structure so that its visible under apache server root
Script command = new Script("mkdir", s_logger);
command.add("-p");
command.add("/var/www/html/");
command.add("/var/www/html/copy");
String result = command.execute();
if (result != null) {
String errorString = "Error in creating directory =" + result;
@ -344,7 +345,7 @@ public class UploadManagerImpl implements UploadManager {
cmd.getInstallPath();
command = new Script("/bin/bash", s_logger);
command.add("-c");
command.add("ln -sf " + publicTemplateRepo + cmd.getInstallPath() + " /var/www/html/");
command.add("ln -sf " + extractMountPoint + File.separator + cmd.getInstallPath() + " /var/www/html/copy/");
result = command.execute();
if (result != null) {
String errorString = "Error in linking err=" + result;
@ -365,7 +366,7 @@ public class UploadManagerImpl implements UploadManager {
Script command = new Script("/bin/bash", s_logger);
command.add("-c");
//We just need to remove the UUID.vhd
command.add("unlink /var/www/html/" +path.substring(path.lastIndexOf(File.separator) + 1));
command.add("unlink /var/www/html/copy/" +path.substring(path.lastIndexOf(File.separator) + 1));
String result = command.execute();
if (result != null) {
String errorString = "Error in deleting =" + result;
@ -438,8 +439,8 @@ public class UploadManagerImpl implements UploadManager {
configureFolders(name, params);
String inSystemVM = (String)params.get("secondary.storage.vm");
if (inSystemVM != null && "true".equalsIgnoreCase(inSystemVM)) {
//s_logger.info("UploadManager: starting additional services since we are inside system vm");
//startAdditionalServices();
s_logger.info("UploadManager: starting additional services since we are inside system vm");
startAdditionalServices();
//blockOutgoingOnPrivate();
}
@ -460,6 +461,37 @@ public class UploadManagerImpl implements UploadManager {
return true;
}
private void startAdditionalServices() {
Script command = new Script("rm", s_logger);
command.add("-rf");
command.add(extractMountPoint);
String result = command.execute();
if (result != null) {
s_logger.warn("Error in creating file " +extractMountPoint+ " ,error: " + result );
return;
}
command = new Script("touch", s_logger);
command.add(extractMountPoint);
result = command.execute();
if (result != null) {
s_logger.warn("Error in creating file " +extractMountPoint+ " ,error: " + result );
return;
}
command = new Script("/bin/bash", s_logger);
command.add("-c");
command.add("ln -sf " + parentDir + " " +extractMountPoint);
result = command.execute();
if (result != null) {
s_logger.warn("Error in linking err=" + result );
return;
}
}
protected void configureFolders(String name, Map<String, Object> params) throws ConfigurationException {
parentDir = (String) params.get("template.parent");
if (parentDir == null) {
@ -574,20 +606,6 @@ public class UploadManagerImpl implements UploadManager {
}
}
private void blockOutgoingOnPrivate() {
Script command = new Script("/bin/bash", s_logger);
String intf = "eth1";
command.add("-c");
command.add("iptables -A OUTPUT -o " + intf + " -p tcp -m state --state NEW -m tcp --dport " + "80" + " -j REJECT;" +
"iptables -A OUTPUT -o " + intf + " -p tcp -m state --state NEW -m tcp --dport " + "443" + " -j REJECT;");
String result = command.execute();
if (result != null) {
s_logger.warn("Error in blocking outgoing to port 80/443 err=" + result );
return;
}
}
private boolean checkAndStartApache() {
//Check whether the Apache server is running

4
server/src/com/cloud/storage/upload/UploadMonitorImpl.java
View File

@ -306,7 +306,7 @@ public class UploadMonitorImpl implements UploadMonitor {
hostname = hostname + ".realhostip.com";
scheme = "https";
}
return scheme + "://" + hostname + path.substring(path.lastIndexOf("/"));
return scheme + "://" + hostname + "/copy" + path.substring(path.lastIndexOf("/"));
}
@ -320,7 +320,7 @@ public class UploadMonitorImpl implements UploadMonitor {
throws ConfigurationException {
_name = name;
final Map<String, String> configs = _configDao.getConfiguration("ManagementServer", params);
_sslCopy = Boolean.parseBoolean(configs.get("secstorage.encrypt.copy"));
//_sslCopy = Boolean.parseBoolean(configs.get("secstorage.encrypt.copy"));
String cert = configs.get("secstorage.secure.copy.cert");
if ("realhostip.com".equalsIgnoreCase(cert)) {