You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/09/18 12:55:31 UTC

[1/2] git commit: updated refs/heads/master to 7f44085

Repository: cloudstack
Updated Branches:
  refs/heads/master dec9133dc -> 7f440854f


CLOUDSTACK-7527 reboot faster by writing to /proc/sysrq-trigger

(cherry picked from commit d04f59a30d130dbb83f162af6e67334fe2c9cef0)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e1e56d3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e1e56d3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e1e56d3

Branch: refs/heads/master
Commit: 6e1e56d399a7f2bfdc24528f58394bb9169e4b10
Parents: dec9133
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Sep 10 11:46:46 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu Sep 18 12:51:42 2014 +0200

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e1e56d3/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
index 88f4841..b4ef56e 100755
--- a/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
+++ b/scripts/vm/hypervisor/xenserver/xenheartbeat.sh
@@ -109,4 +109,4 @@ do
 done
 
 /usr/bin/logger -t heartbeat "Problem with $hb: not reachable for $(($(date +%s) - $lastdate)) seconds, rebooting system!"
-reboot -f
+echo b > /proc/sysrq-trigger
\ No newline at end of file


[2/2] git commit: updated refs/heads/master to 7f44085

Posted by da...@apache.org.
CLOUDSTACK-7184 retry-wait loop config to deal with network glitches

(cherry picked from commit a29f954a269c992307f0410df88ca4ac7a0b82a0)

Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f440854
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f440854
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f440854

Branch: refs/heads/master
Commit: 7f440854f7bcd41a1bd6581c0239cde2e98261b7
Parents: 6e1e56d
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Sep 16 12:20:30 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu Sep 18 12:55:05 2014 +0200

----------------------------------------------------------------------
 .../com/cloud/agent/manager/DirectAgentAttache.java   | 14 ++++++++++++--
 .../xenserver/resource/CitrixResourceBase.java        |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f440854/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
index fa89841..6cfe01f 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.log4j.Logger;
-
+import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 
 import com.cloud.agent.api.Answer;
@@ -41,6 +41,10 @@ import com.cloud.resource.ServerResource;
 public class DirectAgentAttache extends AgentAttache {
     private final static Logger s_logger = Logger.getLogger(DirectAgentAttache.class);
 
+    protected final ConfigKey<Integer> _HostPingRetryCount = new ConfigKey<Integer>("Advanced", Integer.class, "host.ping.retry.count", "0",
+            "Number of times retrying a host ping while waiting for check results", true);
+    protected final ConfigKey<Integer> _HostPingRetryTimer = new ConfigKey<Integer>("Advanced", Integer.class, "host.ping.retry.timer", "5",
+            "Interval to wait before retrying a host ping while waiting for check results", true);
     ServerResource _resource;
     List<ScheduledFuture<?>> _futures = new ArrayList<ScheduledFuture<?>>();
     AgentManagerImpl _mgr;
@@ -162,7 +166,13 @@ public class DirectAgentAttache extends AgentAttache {
                 ServerResource resource = _resource;
 
                 if (resource != null) {
-                    PingCommand cmd = resource.getCurrentStatus(_id);
+                    PingCommand cmd = null;
+                    int retried = 0;
+                    while ( cmd == null && ++retried < _HostPingRetryCount.value())
+                    {
+                        cmd = resource.getCurrentStatus(_id);
+                        Thread.sleep(1000*_HostPingRetryTimer.value());
+                    }
                     if (cmd == null) {
                         s_logger.warn("Unable to get current status on " + _id + "(" + _name + ")");
                         return;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f440854/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index f5a2ea4..07b6f7f 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -4170,7 +4170,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
             if (!pingXAPI()) {
                 Thread.sleep(1000);
                 if (!pingXAPI()) {
-                    s_logger.warn(" can not ping xenserver " + _host.uuid);
+                    s_logger.warn("can not ping xenserver " + _host.uuid);
                     return null;
                 }
             }