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

bug 9445: Signal alert for the host if a primary storage pool was unavailable on that host

This commit is contained in:
Alex Huang 2011-04-25 09:29:38 -07:00
parent 4290abb57c
commit 9909371eaa
5 changed files with 94 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/src/com/cloud/exception/ConnectionException.java
View File

@ -19,11 +19,26 @@ package com.cloud.exception;
import com.cloud.utils.SerialVersionUID;
/**
* ConnectionException is thrown by Listeners while processing the startup
* command. There are two uses for this exception and they are distinguished
* by the boolean flag.
* 1. If the flag is set to true, there is an unexpected error during the
* processing. Upon receiving this exception, the AgentManager will
* immediately place the agent under alert. When the function to enable
* to disable the agent, the agent is disabled.
* 2. If the flag is set to false, the listener has decided that the resource
* should be disconnected and reconnected to "refresh" all resource
* information. This is useful when the Listener needed to perform setup
* on the agent and decided it is best to flush connection and reconnect.
* It is important that the Listener does not fall into a loop in this
* situation where it keeps throwing ConnectionException.
*/
public class ConnectionException extends Exception {
private static final long serialVersionUID = SerialVersionUID.ConnectionException;
boolean _error;
public ConnectionException(boolean setupError, String msg) {
this(setupError, msg, null);
}

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

@ -1602,15 +1602,22 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
for (int i = 0; i < cmd.length; i++) {
try {
monitor.second().processConnect(host, cmd[i]);
} catch (ConnectionException e) {
if (e.isSetupError()) {
s_logger.warn("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " + e.getMessage());
handleDisconnect(attache, Event.AgentDisconnected, false);
throw e;
} catch (Exception e) {
if (e instanceof ConnectionException) {
ConnectionException ce = (ConnectionException)e;
if (ce.isSetupError()) {
s_logger.warn("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " + e.getMessage());
handleDisconnect(attache, Event.AgentDisconnected, false);
throw ce;
} else {
s_logger.info("Monitor " + monitor.second().getClass().getSimpleName() + " says not to continue the connect process for " + hostId + " due to " + e.getMessage());
handleDisconnect(attache, Event.ShutdownRequested, false);
return attache;
}
} else {
s_logger.info("Monitor " + monitor.second().getClass().getSimpleName() + " says not to continue the connect process for " + hostId + " due to " + e.getMessage());
handleDisconnect(attache, Event.ShutdownRequested, false);
return attache;
s_logger.error("Monitor " + monitor.second().getClass().getSimpleName() + " says there is an error in the connect process for " + hostId + " due to " + e.getMessage(), e);
handleDisconnect(attache, Event.AgentDisconnected, false);
throw new CloudRuntimeException("Unable to connect " + attache.getId(), e);
}
}
}

53
server/src/com/cloud/storage/StorageManager.java
View File

@ -17,30 +17,30 @@
*/
package com.cloud.storage;
import java.util.List;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.manager.Commands;
import com.cloud.capacity.CapacityVO;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientStorageCapacityException;
import com.cloud.exception.StorageUnavailableException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.Volume.Type;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Manager;
import com.cloud.vm.DiskProfile;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import java.util.List;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.manager.Commands;
import com.cloud.capacity.CapacityVO;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientStorageCapacityException;
import com.cloud.exception.StorageUnavailableException;
import com.cloud.host.Host;
import com.cloud.host.HostVO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.Volume.Type;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
import com.cloud.utils.component.Manager;
import com.cloud.vm.DiskProfile;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
public interface StorageManager extends Manager {
boolean canVmRestartOnAnotherServer(long vmId);
@ -76,9 +76,10 @@ public interface StorageManager extends Manager {
/**
* Add a pool to a host
* @param hostId
* @param pool
* @param pool
* @throws StorageUnavailableException
*/
boolean addPoolToHost(long hostId, StoragePoolVO pool);
void addPoolToHost(long hostId, StoragePoolVO pool) throws StorageUnavailableException;
/**
* Moves a volume from its current storage pool to a storage pool with enough capacity in the specified zone, pod, or cluster

61
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -1169,9 +1169,11 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
s_logger.debug("In createPool Adding the pool to each of the hosts");
List<HostVO> poolHosts = new ArrayList<HostVO>();
for (HostVO h : allHosts) {
success = addPoolToHost(h.getId(), pool);
if (success) {
try {
addPoolToHost(h.getId(), pool);
poolHosts.add(h);
} catch (Exception e) {
s_logger.warn("Unable to establish a connection between " + h + " and " + pool, e);
}
}
@ -1373,45 +1375,42 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
}
@Override
public boolean addPoolToHost(long hostId, StoragePoolVO pool) {
public void addPoolToHost(long hostId, StoragePoolVO pool) throws StorageUnavailableException {
s_logger.debug("Adding pool " + pool.getName() + " to host " + hostId);
if (pool.getPoolType() != StoragePoolType.NetworkFilesystem && pool.getPoolType() != StoragePoolType.Filesystem && pool.getPoolType() != StoragePoolType.IscsiLUN
&& pool.getPoolType() != StoragePoolType.Iscsi && pool.getPoolType() != StoragePoolType.VMFS && pool.getPoolType() != StoragePoolType.SharedMountPoint
&& pool.getPoolType() != StoragePoolType.PreSetup) {
s_logger.warn(" Doesn't support storage pool type " + pool.getPoolType());
return false;
throw new CloudRuntimeException("Doesn't support storage pool type " + pool.getPoolType());
}
ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, pool);
final Answer answer = _agentMgr.easySend(hostId, cmd);
if (answer != null) {
if (answer.getResult() == false) {
String msg = "Add host failed due to ModifyStoragePoolCommand failed" + answer.getDetails();
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, pool.getDataCenterId(), pool.getPodId(), msg, msg);
s_logger.warn(msg);
return false;
}
if (answer instanceof ModifyStoragePoolAnswer) {
ModifyStoragePoolAnswer mspAnswer = (ModifyStoragePoolAnswer) answer;
StoragePoolHostVO poolHost = _poolHostDao.findByPoolHost(pool.getId(), hostId);
if (poolHost == null) {
poolHost = new StoragePoolHostVO(pool.getId(), hostId, mspAnswer.getPoolInfo().getLocalPath().replaceAll("//", "/"));
_poolHostDao.persist(poolHost);
} else {
poolHost.setLocalPath(mspAnswer.getPoolInfo().getLocalPath().replaceAll("//", "/"));
}
pool.setAvailableBytes(mspAnswer.getPoolInfo().getAvailableBytes());
pool.setCapacityBytes(mspAnswer.getPoolInfo().getCapacityBytes());
_storagePoolDao.update(pool.getId(), pool);
return true;
}
} else {
return false;
if (answer == null) {
throw new StorageUnavailableException("Unable to get an answer to the modify storage pool command", pool.getId());
}
return false;
if (!answer.getResult()) {
String msg = "Add host failed due to ModifyStoragePoolCommand failed" + answer.getDetails();
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, pool.getDataCenterId(), pool.getPodId(), msg, msg);
throw new StorageUnavailableException("Unable establish connection from storage head to storage pool " + pool.getId() + " due to " + answer.getDetails(), pool.getId());
}
assert (answer instanceof ModifyStoragePoolAnswer) : "Well, now why won't you actually return the ModifyStoragePoolAnswer when it's ModifyStoragePoolCommand? Pool=" + pool.getId() + "Host=" + hostId;
ModifyStoragePoolAnswer mspAnswer = (ModifyStoragePoolAnswer) answer;
StoragePoolHostVO poolHost = _poolHostDao.findByPoolHost(pool.getId(), hostId);
if (poolHost == null) {
poolHost = new StoragePoolHostVO(pool.getId(), hostId, mspAnswer.getPoolInfo().getLocalPath().replaceAll("//", "/"));
_poolHostDao.persist(poolHost);
} else {
poolHost.setLocalPath(mspAnswer.getPoolInfo().getLocalPath().replaceAll("//", "/"));
}
pool.setAvailableBytes(mspAnswer.getPoolInfo().getAvailableBytes());
pool.setCapacityBytes(mspAnswer.getPoolInfo().getCapacityBytes());
_storagePoolDao.update(pool.getId(), pool);
s_logger.info("Connection established between " + pool + " host + " + hostId);
}
@Override

8
server/src/com/cloud/storage/listener/StoragePoolMonitor.java
View File

@ -28,6 +28,7 @@ import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.exception.ConnectionException;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.host.dao.HostDao;
@ -66,7 +67,7 @@ public class StoragePoolMonitor implements Listener {
}
@Override
public void processConnect(HostVO host, StartupCommand cmd) {
public void processConnect(HostVO host, StartupCommand cmd) throws ConnectionException {
if (cmd instanceof StartupRoutingCommand) {
StartupRoutingCommand scCmd = (StartupRoutingCommand)cmd;
if (scCmd.getHypervisorType() == HypervisorType.XenServer || scCmd.getHypervisorType() == HypervisorType.KVM ||
@ -75,8 +76,11 @@ public class StoragePoolMonitor implements Listener {
for (StoragePoolVO pool : pools) {
Long hostId = host.getId();
s_logger.debug("Host " + hostId + " connected, sending down storage pool information ...");
if(_storageManager.addPoolToHost(hostId, pool)){
try {
_storageManager.addPoolToHost(hostId, pool);
_storageManager.createCapacityEntry(pool);
} catch (Exception e) {
throw new ConnectionException(true, "Unable to connect to pool " + pool, e);
}
}
}