From c17250da5aca931438b5b031839e1dad20955f16 Mon Sep 17 00:00:00 2001 From: Simon Weller Date: Fri, 4 Mar 2016 07:40:27 -0600 Subject: [PATCH 1/2] CLOUDSTACK-9285 - Agent thows an exception that can never be recovered from --- agent/src/com/cloud/agent/Agent.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java index 994e82248946..7ed3fdaae395 100644 --- a/agent/src/com/cloud/agent/Agent.java +++ b/agent/src/com/cloud/agent/Agent.java @@ -412,7 +412,8 @@ protected void reconnect(final Link link) { try { _connection.start(); } catch (final NioConnectionException e) { - throw new CloudRuntimeException("Unable to start the connection!", e); + s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again..."); + } _shell.getBackoffAlgorithm().waitBeforeRetry(); } while (!_connection.isStartup()); From c9f2f72f46197f856bbf20f32c644c1c304bd136 Mon Sep 17 00:00:00 2001 From: Simon Weller Date: Sun, 6 Mar 2016 08:19:39 -0600 Subject: [PATCH 2/2] changes tabs to spaces --- agent/src/com/cloud/agent/Agent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java index 7ed3fdaae395..912d3088e1cd 100644 --- a/agent/src/com/cloud/agent/Agent.java +++ b/agent/src/com/cloud/agent/Agent.java @@ -412,7 +412,7 @@ protected void reconnect(final Link link) { try { _connection.start(); } catch (final NioConnectionException e) { - s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again..."); + s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again..."); } _shell.getBackoffAlgorithm().waitBeforeRetry();