cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [3/3] git commit: updated refs/heads/master to 0403a35
Date Wed, 20 Jan 2016 14:07:02 GMT
Merge pull request #857 from karuturi/CLOUDSTACK-8885

Cloudstack-8885 added blocked connection listener for rabbitmqeventbus When rabbitmq connections
are blocked(for example when rabbitmq is
server is out of space), all the cloudstack threads which does any
action and publishes to rabbitmq(for example login, launch vm etc.) are
all blocked.

Added a blocked connection listener to handle this and unblock the
parent thread.

also updated rabbitmq amqp client to 3.5.4 from 3.4.2

Testing:
I didnt find a way to write tests for this change as of now.
manually tested that login and other cloudstack apis work when the configured rabbitmq server
goes out of space and publish actions are blocked.

* pr/857:
  CLOUDSTACK-8885: added blocked connection listener for rabbitmqeventbus
  updating rabbitmq amqp client to 3.5.4 from 3.4.2

Signed-off-by: Remi Bergsma <github@remi.nl>


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

Branch: refs/heads/master
Commit: 0403a3522e2f507bd53f80978c38da026889c743
Parents: bca6076 a723988
Author: Remi Bergsma <github@remi.nl>
Authored: Wed Jan 20 15:06:45 2016 +0100
Committer: Remi Bergsma <github@remi.nl>
Committed: Wed Jan 20 15:06:45 2016 +0100

----------------------------------------------------------------------
 plugins/event-bus/rabbitmq/pom.xml              |  2 +-
 .../mom/rabbitmq/RabbitMQEventBus.java          | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0403a352/plugins/event-bus/rabbitmq/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0403a352/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
----------------------------------------------------------------------
diff --cc plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
index eb989dd,29af687..5c0d6ce
--- a/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
+++ b/plugins/event-bus/rabbitmq/src/org/apache/cloudstack/mom/rabbitmq/RabbitMQEventBus.java
@@@ -27,8 -27,11 +27,10 @@@ import java.util.concurrent.ConcurrentH
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Executors;
  
 -import javax.ejb.Local;
  import javax.naming.ConfigurationException;
  
+ import com.cloud.utils.exception.CloudRuntimeException;
+ import com.rabbitmq.client.BlockedListener;
  import org.apache.log4j.Logger;
  
  import com.rabbitmq.client.AMQP;


Mime
View raw message