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

don't call _secMgr.generateSetupCommand each time copying template 

it will reboot httpd making in processing copy fail
This commit is contained in:
frank 2012-04-24 22:39:52 -07:00
parent 5ba91c66d7
commit b4b10dc5bc
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
View File

@ -605,7 +605,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
String root = _parent + "/" + dir;
mount(root, nfsPath);
//configCerts(cmd.getCerts());
configCerts(cmd.getCerts());
return new SecStorageSetupAnswer(dir);
} catch (Exception e) {

4
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
View File

@ -245,9 +245,7 @@ public class DownloadMonitorImpl implements DownloadMonitor {
if (srcTmpltHost == null) {
throw new InvalidParameterValueException("Template " + template.getName() + " not associated with " + sourceServer.getName());
}
if( !_secMgr.generateSetupCommand(sourceServer.getId()) ){
return false;
}
String url = generateCopyUrl(sourceServer, srcTmpltHost);
if (url == null) {
s_logger.warn("Unable to start/resume copy of template " + template.getUniqueName() + " to " + destServer.getName() + ", no secondary storage vm in running state in source zone");