You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/03/24 16:17:45 UTC
[1/7] git commit: updated refs/heads/master to 5251eed
Repository: cloudstack
Updated Branches:
refs/heads/master c48b6c33c -> 5251eeddf
Cloudstack 9285 for 4.7.x
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b6fbe6a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b6fbe6a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b6fbe6a
Branch: refs/heads/master
Commit: 5b6fbe6aebbe9cd24dfebe9271ecb5dc40877c94
Parents: a243339
Author: Simon Weller <sw...@ena.com>
Authored: Mon Mar 7 16:23:35 2016 -0600
Committer: Simon Weller <sw...@ena.com>
Committed: Mon Mar 7 16:23:35 2016 -0600
----------------------------------------------------------------------
agent/src/com/cloud/agent/Agent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b6fbe6a/agent/src/com/cloud/agent/Agent.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java
index 994e822..912d308 100644
--- a/agent/src/com/cloud/agent/Agent.java
+++ b/agent/src/com/cloud/agent/Agent.java
@@ -412,7 +412,8 @@ public class Agent implements HandlerFactory, IAgentControl {
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());
[3/7] git commit: updated refs/heads/master to 5251eed
Posted by sw...@apache.org.
Cloudstack 9285 for 4.7.x
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3683dff4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3683dff4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3683dff4
Branch: refs/heads/master
Commit: 3683dff493e2493ac3f1ac0b572e8b21361c2134
Parents: a243339
Author: Simon Weller <sw...@ena.com>
Authored: Mon Mar 7 16:23:35 2016 -0600
Committer: Simon Weller <sw...@ena.com>
Committed: Tue Mar 8 09:48:13 2016 -0600
----------------------------------------------------------------------
agent/src/com/cloud/agent/Agent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3683dff4/agent/src/com/cloud/agent/Agent.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java
index 994e822..2dee5a4 100644
--- a/agent/src/com/cloud/agent/Agent.java
+++ b/agent/src/com/cloud/agent/Agent.java
@@ -227,7 +227,7 @@ public class Agent implements HandlerFactory, IAgentControl {
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...");
}
while (!_connection.isStartup()) {
_shell.getBackoffAlgorithm().waitBeforeRetry();
@@ -235,7 +235,7 @@ public class Agent implements HandlerFactory, IAgentControl {
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...");
}
}
}
@@ -412,7 +412,7 @@ public class Agent implements HandlerFactory, IAgentControl {
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());
[5/7] git commit: updated refs/heads/master to 5251eed
Posted by sw...@apache.org.
Merge pull request #1430 from myENA/4.7_cloudstack-9285
CLOUDSTACK-9285 for 4.7.xPer Daan's request, here is a pull request for the 4.7.x release.
* pr/1430:
Cloudstack 9285 for 4.7.x
CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
Cloudstack 9285 for 4.7.x
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4db1c012
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4db1c012
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4db1c012
Branch: refs/heads/master
Commit: 4db1c0125a3b8f5c46a9e3500fe3eec4ca9e95dc
Parents: 9610056 454ea4a
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Mar 24 11:01:26 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Mar 24 11:01:27 2016 -0400
----------------------------------------------------------------------
agent/src/com/cloud/agent/Agent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[4/7] git commit: updated refs/heads/master to 5251eed
Posted by sw...@apache.org.
Cloudstack-9285
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/454ea4a0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/454ea4a0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/454ea4a0
Branch: refs/heads/master
Commit: 454ea4a0b0911406ea8a4bd94b39860dc5560b82
Parents: 3683dff c69a242
Author: Simon Weller <sw...@ena.com>
Authored: Tue Mar 8 09:55:24 2016 -0600
Committer: Simon Weller <sw...@ena.com>
Committed: Tue Mar 8 09:55:24 2016 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[7/7] git commit: updated refs/heads/master to 5251eed
Posted by sw...@apache.org.
Merge release branch 4.8 to master
* 4.8:
Cloudstack 9285 for 4.7.x
CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
Cloudstack 9285 for 4.7.x
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5251eedd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5251eedd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5251eedd
Branch: refs/heads/master
Commit: 5251eeddf291a34620f770ea4d1f7b1f8af38293
Parents: c48b6c3 64eef21
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Mar 24 11:16:52 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Mar 24 11:16:52 2016 -0400
----------------------------------------------------------------------
agent/src/com/cloud/agent/Agent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/7] git commit: updated refs/heads/master to 5251eed
Posted by sw...@apache.org.
CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c69a2428
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c69a2428
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c69a2428
Branch: refs/heads/master
Commit: c69a2428977aed7df497a479a7e802e9d8d0e922
Parents: 5b6fbe6
Author: Simon Weller <sw...@ena.com>
Authored: Tue Mar 8 09:14:07 2016 -0600
Committer: Simon Weller <sw...@ena.com>
Committed: Tue Mar 8 09:14:07 2016 -0600
----------------------------------------------------------------------
agent/src/com/cloud/agent/Agent.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c69a2428/agent/src/com/cloud/agent/Agent.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java
index 912d308..7e0a435 100644
--- a/agent/src/com/cloud/agent/Agent.java
+++ b/agent/src/com/cloud/agent/Agent.java
@@ -227,7 +227,7 @@ public class Agent implements HandlerFactory, IAgentControl {
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...");
}
while (!_connection.isStartup()) {
_shell.getBackoffAlgorithm().waitBeforeRetry();
@@ -235,7 +235,7 @@ public class Agent implements HandlerFactory, IAgentControl {
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...");
}
}
}
@@ -413,7 +413,6 @@ public class Agent implements HandlerFactory, IAgentControl {
_connection.start();
} catch (final NioConnectionException e) {
s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
-
}
_shell.getBackoffAlgorithm().waitBeforeRetry();
} while (!_connection.isStartup());
[6/7] git commit: updated refs/heads/master to 5251eed
Posted by sw...@apache.org.
Merge release branch 4.7 to 4.8
* 4.7:
Cloudstack 9285 for 4.7.x
CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
Cloudstack 9285 for 4.7.x
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/64eef210
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/64eef210
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/64eef210
Branch: refs/heads/master
Commit: 64eef2104fea88c12c944a9207213f4b3294d325
Parents: 12a4ca2 4db1c01
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Mar 24 11:15:20 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Mar 24 11:15:20 2016 -0400
----------------------------------------------------------------------
agent/src/com/cloud/agent/Agent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------