Skip to content

Commit 7920ecf

Browse files
bvbharatbvbharat
committed
CLOUDSTACK-8855 Improve Error Message for Host Alert State
1 parent 1234cc1 commit 7920ecf

8 files changed

Lines changed: 49 additions & 41 deletions

File tree

‎api/src/com/cloud/resource/ResourceService.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import java.util.List;
2020

21+
import com.cloud.exception.AgentUnavailableException;
22+
import com.cloud.utils.exception.CloudRuntimeException;
2123
import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
2224
import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;
2325
import org.apache.cloudstack.api.command.admin.host.AddHostCmd;
@@ -49,7 +51,7 @@ public interface ResourceService {
4951

5052
Host cancelMaintenance(CancelMaintenanceCmd cmd);
5153

52-
Host reconnectHost(ReconnectHostCmd cmd);
54+
Host reconnectHost(ReconnectHostCmd cmd) throws CloudRuntimeException, AgentUnavailableException;
5355

5456
/**
5557
* We will automatically create a cloud.com cluster to attach to the external cluster and return a hyper host to perform

‎api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
// under the License.
1717
package org.apache.cloudstack.api.command.admin.host;
1818

19+
import com.cloud.exception.AgentUnavailableException;
20+
import com.cloud.exception.InvalidParameterValueException;
21+
import com.cloud.utils.exception.CloudRuntimeException;
1922
import org.apache.log4j.Logger;
2023

2124
import org.apache.cloudstack.api.APICommand;
@@ -100,17 +103,18 @@ public Long getInstanceId() {
100103
@Override
101104
public void execute() {
102105
try {
103-
Host result = _resourceService.reconnectHost(this);
104-
if (result != null) {
105-
HostResponse response = _responseGenerator.createHostResponse(result);
106-
response.setResponseName(getCommandName());
107-
this.setResponseObject(response);
108-
} else {
109-
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to reconnect host");
110-
}
111-
} catch (Exception ex) {
112-
s_logger.warn("Exception: ", ex);
113-
throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());
106+
Host result =_resourceService.reconnectHost(this);
107+
HostResponse response = _responseGenerator.createHostResponse(result);
108+
response.setResponseName(getCommandName());
109+
this.setResponseObject(response);
110+
}catch (InvalidParameterValueException e) {
111+
throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage());
112+
}
113+
catch (CloudRuntimeException e) {
114+
s_logger.warn("Exception: ", e);
115+
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
116+
}catch (AgentUnavailableException e) {
117+
throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, e.getMessage());
114118
}
115119
}
116120
}

‎engine/components-api/src/com/cloud/agent/AgentManager.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717
package com.cloud.agent;
1818

19+
import com.cloud.utils.exception.CloudRuntimeException;
1920
import org.apache.cloudstack.framework.config.ConfigKey;
2021

2122
import com.cloud.agent.api.Answer;
@@ -143,7 +144,7 @@ public enum TapAgentsAction {
143144

144145
public void pullAgentOutMaintenance(long hostId);
145146

146-
boolean reconnect(long hostId);
147+
void reconnect(long hostId) throws CloudRuntimeException, AgentUnavailableException;
147148

148149
void rescan();
149150
}

‎engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -971,33 +971,28 @@ public Answer[] send(final Long hostId, final Commands cmds) throws AgentUnavail
971971
}
972972

973973
@Override
974-
public boolean reconnect(final long hostId) {
974+
public void reconnect(final long hostId) throws CloudRuntimeException, AgentUnavailableException{
975975
HostVO host;
976976

977977
host = _hostDao.findById(hostId);
978978
if (host == null || host.getRemoved() != null) {
979-
s_logger.warn("Unable to find host " + hostId);
980-
return false;
979+
throw new CloudRuntimeException("Unable to find host " + hostId);
981980
}
982981

983982
if (host.getStatus() == Status.Disconnected) {
984-
s_logger.info("Host is already disconnected, no work to be done");
985-
return true;
983+
throw new CloudRuntimeException("Host is already disconnected, no work to be done");
986984
}
987985

988986
if (host.getStatus() != Status.Up && host.getStatus() != Status.Alert && host.getStatus() != Status.Rebalancing) {
989-
s_logger.info("Unable to disconnect host because it is not in the correct state: host=" + hostId + "; Status=" + host.getStatus());
990-
return false;
987+
throw new CloudRuntimeException("Unable to disconnect host because it is not in the correct state: host=" + hostId + "; Status=" + host.getStatus());
991988
}
992989

993990
final AgentAttache attache = findAttache(hostId);
994991
if (attache == null) {
995-
s_logger.info("Unable to disconnect host because it is not connected to this server: " + hostId);
996-
return false;
992+
throw new CloudRuntimeException("Unable to disconnect host because it is not connected to this server: " + hostId);
997993
}
998994

999995
disconnectWithoutInvestigation(attache, Event.ShutdownRequested);
1000-
return true;
1001996
}
1002997

1003998
public boolean executeUserRequest(final long hostId, final Event event) throws AgentUnavailableException {
@@ -1012,7 +1007,13 @@ public boolean executeUserRequest(final long hostId, final Event event) throws A
10121007
}
10131008
return true;
10141009
} else if (event == Event.ShutdownRequested) {
1015-
return reconnect(hostId);
1010+
//should throw a exception here as well.instead of eating this up.
1011+
try {
1012+
reconnect(hostId);
1013+
} catch (CloudRuntimeException e) {
1014+
return false;
1015+
}
1016+
return true;
10161017
}
10171018
return false;
10181019
}

‎engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -360,19 +360,12 @@ public boolean executeUserRequest(final long hostId, final Event event) throws A
360360
}
361361

362362
@Override
363-
public boolean reconnect(final long hostId) {
364-
Boolean result;
365-
try {
366-
result = propagateAgentEvent(hostId, Event.ShutdownRequested);
367-
if (result != null) {
368-
return result;
369-
}
370-
} catch (final AgentUnavailableException e) {
371-
s_logger.debug("cannot propagate agent reconnect because agent is not available", e);
372-
return false;
363+
public void reconnect(final long hostId) throws CloudRuntimeException, AgentUnavailableException {
364+
Boolean result = propagateAgentEvent(hostId, Event.ShutdownRequested);
365+
if (result!=null && !result) {
366+
throw new CloudRuntimeException("Failed to propagating agent change request event:" + Event.ShutdownRequested + " to host:" + hostId);
373367
}
374-
375-
return super.reconnect(hostId);
368+
super.reconnect(hostId);
376369
}
377370

378371
public void notifyNodesInCluster(final AgentAttache attache) {

‎plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,11 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
514514
});
515515
HostVO host = _hostDao.findById(lbDeviceVo.getHostId());
516516

517-
_agentMgr.reconnect(host.getId());
517+
try {
518+
_agentMgr.reconnect(host.getId());
519+
} catch (Exception e ) {
520+
s_logger.debug("failed to reconnect host "+host);
521+
}
518522
return lbDeviceVo;
519523
}
520524

‎server/src/com/cloud/alert/AlertManagerImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,9 @@ public void sendAlert(AlertType alertType, long dataCenterId, Long podId, Long c
768768
// set up a new alert
769769
AlertVO newAlert = new AlertVO();
770770
newAlert.setType(alertType.getType());
771-
newAlert.setSubject(subject);
771+
//do not have a seperate column for content.
772+
//appending the message to the subject for now.
773+
newAlert.setSubject(subject+content);
772774
newAlert.setClusterId(clusterId);
773775
newAlert.setPodId(podId);
774776
newAlert.setDataCenterId(dataCenterId);

‎server/src/com/cloud/resource/ResourceManagerImpl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,15 +1148,16 @@ public Host cancelMaintenance(final CancelMaintenanceCmd cmd) {
11481148
}
11491149

11501150
@Override
1151-
public Host reconnectHost(final ReconnectHostCmd cmd) {
1152-
final Long hostId = cmd.getId();
1151+
public Host reconnectHost(ReconnectHostCmd cmd) throws CloudRuntimeException, AgentUnavailableException{
1152+
Long hostId = cmd.getId();
11531153

11541154
final HostVO host = _hostDao.findById(hostId);
11551155
if (host == null) {
11561156
throw new InvalidParameterValueException("Host with id " + hostId.toString() + " doesn't exist");
11571157
}
11581158

1159-
return _agentMgr.reconnect(hostId) ? host : null;
1159+
_agentMgr.reconnect(hostId);
1160+
return host;
11601161
}
11611162

11621163
@Override

0 commit comments

Comments
 (0)