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

bug 9397 : CreateTemplate - generate MD5 checksum of the template. The code will calculate the checksum after the template has been created in the secondary storage. This code would be executed by ssvm. This would be agnostic of the way the template was created (not hypervisor specific). 

status 9397: resolved fixed
This commit is contained in:
nit 2011-05-12 18:12:48 +05:30
parent d8b7f5c19b
commit bc360f499d
3 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,9 +68,13 @@ import com.cloud.storage.template.TemplateConstants;
import com.cloud.storage.template.TemplateInfo;
import com.cloud.user.Account;
import com.cloud.utils.component.Inject;
import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.SecondaryStorageVm;
import com.cloud.vm.SecondaryStorageVmVO;
import com.cloud.vm.UserVmManager;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.SecondaryStorageVmDao;
@ -83,8 +87,7 @@ import com.cloud.vm.dao.SecondaryStorageVmDao;
@Local(value={DownloadMonitor.class})
public class DownloadMonitorImpl implements DownloadMonitor {
static final Logger s_logger = Logger.getLogger(DownloadMonitorImpl.class);
private static final String DEFAULT_HTTP_COPY_PORT = "80";
@Inject
VMTemplateHostDao _vmTemplateHostDao;
@Inject
@ -108,6 +111,9 @@ public class DownloadMonitorImpl implements DownloadMonitor {
private AgentManager _agentMgr;
@Inject
ConfigurationDao _configDao;
@Inject
UserVmManager _vmMgr;
@Inject
private UsageEventDao _usageEventDao;
@ -120,7 +126,7 @@ public class DownloadMonitorImpl implements DownloadMonitor {
private String _name;
private Boolean _sslCopy = new Boolean(false);
private String _copyAuthPasswd;
protected SearchBuilder<VMTemplateHostVO> ReadyTemplateStatesSearch;
Timer _timer;
@ -146,6 +152,20 @@ public class DownloadMonitorImpl implements DownloadMonitor {
_copyAuthPasswd = configs.get("secstorage.copy.password");
_agentMgr.registerForHostEvents(new DownloadListener(this), true, false, false);
ReadyTemplateStatesSearch = _vmTemplateHostDao.createSearchBuilder();
ReadyTemplateStatesSearch.and("download_state", ReadyTemplateStatesSearch.entity().getDownloadState(), SearchCriteria.Op.EQ);
ReadyTemplateStatesSearch.and("destroyed", ReadyTemplateStatesSearch.entity().getDestroyed(), SearchCriteria.Op.EQ);
ReadyTemplateStatesSearch.and("host_id", ReadyTemplateStatesSearch.entity().getHostId(), SearchCriteria.Op.EQ);
SearchBuilder<VMTemplateVO> TemplatesWithNoChecksumSearch = _templateDao.createSearchBuilder();
TemplatesWithNoChecksumSearch.and("checksum", TemplatesWithNoChecksumSearch.entity().getChecksum(), SearchCriteria.Op.NULL);
ReadyTemplateStatesSearch.join("vm_template", TemplatesWithNoChecksumSearch, TemplatesWithNoChecksumSearch.entity().getId(),
ReadyTemplateStatesSearch.entity().getTemplateId(), JoinBuilder.JoinType.INNER);
TemplatesWithNoChecksumSearch.done();
ReadyTemplateStatesSearch.done();
return true;
}
@ -582,6 +602,10 @@ public class DownloadMonitorImpl implements DownloadMonitor {
String description = "Deleted template " + tInfo.getTemplateName() + " on secondary storage " + sserverId + " since it isn't in the database, result=" + result;
s_logger.info(description);
}
//This code is mostly for migration purposes so that we have checksum for all the templates
checksumSync(sserverId);
}
@ -600,6 +624,23 @@ public class DownloadMonitorImpl implements DownloadMonitor {
}
}
private void checksumSync(long hostId){
SearchCriteria<VMTemplateHostVO> sc = ReadyTemplateStatesSearch.create();
sc.setParameters("download_state", com.cloud.storage.VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
List<VMTemplateHostVO> templateHostRefList = _vmTemplateHostDao.search(sc, null);
s_logger.debug("Found " +templateHostRefList.size()+ " templates with no checksum. Will ask for computation");
for(VMTemplateHostVO templateHostRef : templateHostRefList){
s_logger.debug("Getting checksum for template - " + templateHostRef.getTemplateId());
String checksum = _vmMgr.getChecksum(hostId, templateHostRef.getInstallPath());
VMTemplateVO template = _templateDao.findById(templateHostRef.getTemplateId());
s_logger.debug("Setting checksum " +checksum+ " for template - " + template.getName());
template.setChecksum(checksum);
_templateDao.update(template.getId(), template);
}
}
private Long getMaxTemplateSizeInBytes() {
try {
return Long.parseLong(_configDao.getValue("max.template.iso.size")) * 1024L * 1024L * 1024L;

2
server/src/com/cloud/vm/UserVmManager.java Normal file → Executable file
View File

@ -87,4 +87,6 @@ public interface UserVmManager extends VirtualMachineGuru<UserVmVO>{
* @return List of UserVMs.
*/
List<UserVmVO> searchForUserVMs(Criteria c);
String getChecksum(Long hostId, String templatePath);
}

10
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1584,11 +1584,16 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
return privateTemplate;
}
private String getChecksum(Long hostId, String templatePath){
@Override
public String getChecksum(Long hostId, String templatePath){
Answer answer;
try {
answer = _agentMgr.send(hostId, new ComputeChecksumCommand(templatePath));
return answer.getDetails();
if(answer.getResult())
return answer.getDetails();
else
return null;
} catch (AgentUnavailableException e) {
s_logger.error("Unable to send ComputeChecksumCommand to " + hostId, e);
} catch (OperationTimedoutException e) {
@ -1596,6 +1601,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
}
return null;
}
// used for vm transitioning to error state
private void updateVmStateForFailedVmCreation(Long vmId) {
UserVmVO vm = _vmDao.findById(vmId);