You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/27 21:51:55 UTC
[1/2] git commit: Added condition to wait health event message
delegator until topology is initialized
Updated Branches:
refs/heads/master 122658996 -> 945f333ba
Added condition to wait health event message delegator until topology is initialized
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/db958c4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/db958c4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/db958c4d
Branch: refs/heads/master
Commit: db958c4d0a77f760f3be5be4ad91ba3da6af2ccc
Parents: 3fca23c
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Dec 28 02:21:27 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 28 02:21:27 2013 +0530
----------------------------------------------------------------------
.../receiver/health/HealthEventMessageDelegator.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/db958c4d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
index e02f6a5..e5e07b3 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
@@ -55,16 +55,23 @@ public class HealthEventMessageDelegator implements Runnable {
@Override
public void run() {
- log.info("Health event message delegator started");
+ if(log.isInfoEnabled()) {
+ log.info("Health event message delegator started");
+ }
+
+ if(log.isDebugEnabled()) {
+ log.debug("Waiting for topology to be initialized");
+ }
+ while(!TopologyManager.getTopology().isInitialized());
while (!terminate) {
try {
TextMessage message = HealthEventQueue.getInstance().take();
String messageText = message.getText();
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Health event message received: [message] " + messageText);
-
+ }
Event event = jsonToEvent(messageText);
String eventName = event.getEventName();
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/945f333b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/945f333b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/945f333b
Branch: refs/heads/master
Commit: 945f333ba5ed85e6ca50139ae34cd421093c6d2b
Parents: db958c4 1226589
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Dec 28 02:21:45 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 28 02:21:45 2013 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/MemberStatsContext.java | 18 ++++++++++--------
.../health/HealthEventMessageDelegator.java | 9 ---------
.../autoscaler/rule/RuleTasksDelegator.java | 8 ++++++++
.../distribution/src/main/conf/scaling.drl | 6 +++---
4 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/945f333b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
----------------------------------------------------------------------