weizhouapache commented on code in PR #10158:
URL: https://github.com/apache/cloudstack/pull/10158#discussion_r1928491645
##########
engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java:
##########
@@ -569,27 +570,27 @@ protected AgentAttache notifyMonitorsOfConnection(final
AgentAttache attache, fi
}
for (int i = 0; i < cmd.length; i++) {
try {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("process connection to issue " +
ReflectionToStringBuilderUtils.reflectCollection(cmd[i]) + " forRebalance == "
+ forRebalance);
+ }
monitor.second().processConnect(host, cmd[i],
forRebalance);
- } catch (final Exception e) {
- if (e instanceof ConnectionException) {
- final 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());
- handleDisconnectWithoutInvestigation(attache,
Event.AgentDisconnected, true, true);
- throw ce;
- } else {
- s_logger.info("Monitor " +
monitor.second().getClass().getSimpleName() + " says not to continue the
connect process for " + hostId + " due to " + e.getMessage());
- handleDisconnectWithoutInvestigation(attache,
Event.ShutdownRequested, true, true);
- return attache;
- }
- } else if (e instanceof HypervisorVersionChangedException)
{
- handleDisconnectWithoutInvestigation(attache,
Event.ShutdownRequested, true, true);
- throw new CloudRuntimeException("Unable to connect " +
attache.getId(), e);
- } else {
- s_logger.error("Monitor " +
monitor.second().getClass().getSimpleName() + " says there is an error in the
connect process for " + hostId + " due to " + e.getMessage(), e);
+ } catch (final ConnectionException ce) {
+ if (ce.isSetupError()) {
+ s_logger.warn("Monitor " +
monitor.second().getClass().getSimpleName() + " says there is an error in the
connect process for " + hostId + " due to " + ce.getMessage());
handleDisconnectWithoutInvestigation(attache,
Event.AgentDisconnected, true, true);
- throw new CloudRuntimeException("Unable to connect " +
attache.getId(), e);
+ throw ce;
Review Comment:
ok. should we keep #10154 open ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
