Repository: cloudstack Updated Branches: refs/heads/4.4 69e550f5e -> 8696f386d
disble XS event, found there is an issue when event.from is called by multiple thread. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8696f386 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8696f386 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8696f386 Branch: refs/heads/4.4 Commit: 8696f386dd73baf0b8281166a75195b3570e3436 Parents: 69e550f Author: Anthony Xu <anthony...@citrix.com> Authored: Tue Apr 29 11:06:03 2014 -0700 Committer: Anthony Xu <anthony...@citrix.com> Committed: Tue Apr 29 11:06:03 2014 -0700 ---------------------------------------------------------------------- .../hypervisor/xenserver/XenServerResourceNewBase.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8696f386/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java b/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java index d11db0d..f93de32 100644 --- a/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java +++ b/plugins/hypervisors/xen/src/org/apache/cloudstack/hypervisor/xenserver/XenServerResourceNewBase.java @@ -31,11 +31,12 @@ import com.xensource.xenapi.Types.XenAPIException; import com.xensource.xenapi.VM; import com.xensource.xenapi.Event; +/* import com.xensource.xenapi.Task; import com.xensource.xenapi.Types; -import org.apache.xmlrpc.XmlRpcException; import java.util.concurrent.TimeoutException; - +*/ +import org.apache.xmlrpc.XmlRpcException; import com.cloud.agent.api.Answer; import com.cloud.agent.api.ClusterSyncAnswer; @@ -101,7 +102,7 @@ public class XenServerResourceNewBase extends XenServer620SP1Resource { return cmds; } - +/* protected void waitForTask(Connection c, Task task, long pollInterval, long timeout) throws XenAPIException, XmlRpcException, TimeoutException { long beginTime = System.currentTimeMillis(); if (s_logger.isTraceEnabled()) { @@ -154,7 +155,7 @@ public class XenServerResourceNewBase extends XenServer620SP1Resource { } } - +*/ @Override protected Answer execute(final ClusterSyncCommand cmd) {
