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

multiple secondary storages fix

This commit is contained in:
anthony 2011-05-17 16:01:35 -07:00
parent 392672b9f9
commit 1501503656
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -150,6 +150,8 @@ import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.VMInstanceDao;
import edu.emory.mathcs.backport.java.util.Collections;
/**
* Implementation of the Agent Manager. This class controls the connection to the agents.
*
@ -488,16 +490,17 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
@Override
public HostVO getSSAgent(HostVO ssHost) {
if( ssHost.getType() == Host.Type.LocalSecondaryStorage ) {
return ssHost;
if( ssHost.getStatus() == Status.Up ) {
return ssHost;
}
} else if ( ssHost.getType() == Host.Type.SecondaryStorage) {
Long dcId = ssHost.getDataCenterId();
List<HostVO> ssAHosts = _hostDao.listBy(Host.Type.SecondaryStorageVM, dcId);
if (ssAHosts == null || ssAHosts.isEmpty() ) {
return null;
}
int size = ssAHosts.size();
Random rn = new Random(System.currentTimeMillis());
return ssAHosts.get(rn.nextInt(size));
Collections.shuffle(ssAHosts);
return ssAHosts.get(0);
}
return null;
}
@ -520,9 +523,8 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
if (ssAHosts == null || ssAHosts.isEmpty() ) {
return -1;
}
int size = ssAHosts.size();
Random rn = new Random(System.currentTimeMillis());
HostVO ssAhost = ssAHosts.get(rn.nextInt(size));
Collections.shuffle(ssAHosts);
HostVO ssAhost = ssAHosts.get(0);
try {
return send(ssAhost.getId(), new Commands(cmd), listener);
} catch (final AgentUnavailableException e) {
@ -535,9 +537,8 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
if (ssAHosts == null || ssAHosts.isEmpty() ) {
return new Answer(cmd, false, "can not find secondary storage VM agent for data center " + dcId);
}
int size = ssAHosts.size();
Random rn = new Random(System.currentTimeMillis());
HostVO ssAhost = ssAHosts.get(rn.nextInt(size));
Collections.shuffle(ssAHosts);
HostVO ssAhost = ssAHosts.get(0);
return easySend(ssAhost.getId(), cmd);
}

2
server/src/com/cloud/storage/download/DownloadListener.java
View File

@ -280,7 +280,7 @@ public class DownloadListener implements Listener {
@Override
public void processConnect(HostVO agent, StartupCommand cmd) throws ConnectionException {
if (cmd instanceof StartupRoutingCommand) {
//downloadMonitor.handleSysTemplateDownload(agent);
downloadMonitor.handleSysTemplateDownload(agent);
} else if ( cmd instanceof StartupStorageCommand) {
StartupStorageCommand storage = (StartupStorageCommand)cmd;
if( storage.getResourceType() == Storage.StorageResourceType.SECONDARY_STORAGE ||