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

don't include the whole /usr/share/java/ directory in classpath, or you will get stackoverflow, and delete vm data folder after vm stopped

Browse Source
This commit is contained in:
Edison Su 2011-06-16 12:14:09 -04:00
parent 55c39444b1
commit 1c67301146
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/libexec/agent-runner.in
View File

@ -7,7 +7,7 @@ SYSTEMJARS="@SYSTEMJARS@"
SCP=$(build-classpath $SYSTEMJARS) ; if [ $? != 0 ] ; then SCP="@SYSTEMCLASSPATH@" ; fi
DCP="@DEPSCLASSPATH@"
ACP="@AGENTCLASSPATH@"
export CLASSPATH=/usr/share/java/'*':$SCP:$DCP:$ACP:@AGENTSYSCONFDIR@
export CLASSPATH=$SCP:$DCP:$ACP:@AGENTSYSCONFDIR@
for jarfile in "@PREMIUMJAVADIR@"/* ; do
if [ ! -e "$jarfile" ] ; then continue ; fi
CLASSPATH=$jarfile:$CLASSPATH

20
agent/src/com/cloud/agent/vmdata/JettyVmDataServer.java
View File

@ -60,6 +60,7 @@ import com.cloud.network.Networks.TrafficType;
import com.cloud.storage.JavaStorageLayer;
import com.cloud.storage.StorageLayer;
import com.cloud.utils.net.NetUtils;
import com.cloud.utils.script.Script;
/**
* Serves vm data using embedded Jetty server
@ -283,14 +284,9 @@ public class JettyVmDataServer implements VmDataServer {
@Override
public Answer handleVmDataCommand(VmDataCommand cmd) {
String vmDataDir = _vmDataDir + File.separator + cmd.getVmName();
try {
_fs.cleanup(vmDataDir, _vmDataDir);
_fs.mkdirs(vmDataDir);
} catch (IOException e1) {
s_logger.warn("Failed to cleanup vm data dir " + vmDataDir, e1);
return new Answer(cmd, false, "Failed to cleanup or create directory " + vmDataDir);
}
Script.runSimpleBashScript("rm -rf " + vmDataDir);
_fs.mkdirs(vmDataDir);
for (String [] item : cmd.getVmData()) {
try {
@ -346,13 +342,7 @@ public class JettyVmDataServer implements VmDataServer {
@Override
public void handleVmStopped(String vmName) {
String vmDataDir = _vmDataDir + File.separator + vmName;
try {
_fs.cleanup(vmDataDir, _vmDataDir);
_fs.mkdirs(vmDataDir);
} catch (IOException e1) {
s_logger.warn("Failed to cleanup vm data dir " + vmDataDir, e1);
}
Script.runSimpleBashScript("rm -rf " + vmDataDir);
}
}

8
wscript_configure
View File

@ -59,6 +59,14 @@ systemjars = {
"jasper-6.0.28.jar",
"el-api-2.1.jar",
"jasper-el-6.0.28.jar",
"cglib.jar",
"asm3.jar",
"jetty.jar",
"jetty-util.jar",
"jetty-start-daemon.jar",
"jetty-sslengine.jar",
"jetty-start.jar",
"slf4j-log4j12.jar",
#"catalina.jar",
),
'Windows':