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

CLOUDSTACK-3950: the issue can be reproduced by: copy iso failed during the first time, for some reason, then copy the same iso again, the issue be triggered.

This commit is contained in:
Edison Su 2013-07-31 15:46:17 -07:00
parent 29ec4dc323
commit 4eefce15be
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,10 +103,6 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
@Inject
DataStoreManager storeMgr;
final Map<TemplateDataStoreVO, DownloadListener> _listenerTemplateMap = new ConcurrentHashMap<TemplateDataStoreVO, DownloadListener>();
final Map<VolumeDataStoreVO, DownloadListener> _listenerVolMap = new ConcurrentHashMap<VolumeDataStoreVO, DownloadListener>();
@Override
public boolean configure(String name, Map<String, Object> params) {
final Map<String, String> configs = _configDao.getConfiguration("ManagementServer", params);
@ -189,15 +185,6 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
dl.setCurrState(vmTemplateStore.getDownloadState());
}
DownloadListener old = null;
synchronized (_listenerTemplateMap) {
old = _listenerTemplateMap.put(vmTemplateStore, dl);
}
if (old != null) {
s_logger.info("abandon obsolete download listener");
old.abandon();
}
try {
ep.sendMessageAsync(dcmd, new UploadListener.Callback(ep.getId(), dl));
} catch (Exception e) {
@ -270,13 +257,6 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
if (downloadJobExists) {
dl.setCurrState(volumeHost.getDownloadState());
}
DownloadListener old = null;
synchronized (_listenerVolMap) {
old = _listenerVolMap.put(volumeHost, dl);
}
if (old != null) {
old.abandon();
}
try {
ep.sendMessageAsync(dcmd, new UploadListener.Callback(ep.getId(), dl));