You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/12/20 15:01:17 UTC
[1/8] git commit: Fixing missing arguments in debug logs in
HealthEventMessageDelegator.java
Updated Branches:
refs/heads/master 9e5d98155 -> ce67fc1f9
Fixing missing arguments in debug logs in HealthEventMessageDelegator.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dd98d63c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dd98d63c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dd98d63c
Branch: refs/heads/master
Commit: dd98d63cd30957a12381979a43e39e7d43bd5e13
Parents: febcde5
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 20 14:53:00 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 20 14:53:00 2013 -0500
----------------------------------------------------------------------
.../health/HealthEventMessageDelegator.java | 34 +++++++++++---------
1 file changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/dd98d63c/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 b6a8289..67e6701 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
@@ -18,11 +18,20 @@
*/
package org.apache.stratos.autoscaler.message.receiver.health;
-import com.google.gson.stream.JsonReader;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jms.TextMessage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.autoscaler.*;
+import org.apache.stratos.autoscaler.AutoscalerContext;
+import org.apache.stratos.autoscaler.Constants;
+import org.apache.stratos.autoscaler.NetworkPartitionContext;
+import org.apache.stratos.autoscaler.PartitionContext;
import org.apache.stratos.autoscaler.client.cloud.controller.CloudControllerClient;
import org.apache.stratos.autoscaler.exception.SpawningException;
import org.apache.stratos.autoscaler.exception.TerminationException;
@@ -34,16 +43,9 @@ import org.apache.stratos.cloud.controller.deployment.partition.Partition;
import org.apache.stratos.messaging.domain.topology.Cluster;
import org.apache.stratos.messaging.domain.topology.Member;
import org.apache.stratos.messaging.domain.topology.Service;
-import org.apache.stratos.messaging.domain.topology.Topology;
import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
-import javax.jms.TextMessage;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Map;
+import com.google.gson.stream.JsonReader;
/**
@@ -129,7 +131,7 @@ public class HealthEventMessageDelegator implements Runnable {
loadAverage.setAverage(floatValue);
if (log.isDebugEnabled()) {
- log.debug(String.format("%s event: [member] %s [value] %s", event.getProperties().get("member_id"), value));
+ log.debug(String.format("%s event: [member] %s [value] %s", event, event.getProperties().get("member_id"), value));
}
}
} else if(Constants.MEMBER_SECOND_DERIVATIVE_OF_LOAD_AVERAGE.equals(event.getEventName())) {
@@ -140,7 +142,7 @@ public class HealthEventMessageDelegator implements Runnable {
loadAverage.setSecondDerivative(floatValue);
if (log.isDebugEnabled()) {
- log.debug(String.format("%s event: [member] %s [value] %s", event.getProperties().get("member_id"), value));
+ log.debug(String.format("%s event: [member] %s [value] %s", event, event.getProperties().get("member_id"), value));
}
}
} else if(Constants.MEMBER_GRADIENT_LOAD_AVERAGE.equals(event.getEventName())) {
@@ -151,7 +153,7 @@ public class HealthEventMessageDelegator implements Runnable {
loadAverage.setGradient(floatValue);
if (log.isDebugEnabled()) {
- log.debug(String.format("%s event: [member] %s [value] %s", event.getProperties().get("member_id"), value));
+ log.debug(String.format("%s event: [member] %s [value] %s", event, event.getProperties().get("member_id"), value));
}
}
} else if(Constants.MEMBER_AVERAGE_MEMORY_CONSUMPTION.equals(event.getEventName())) {
@@ -162,7 +164,7 @@ public class HealthEventMessageDelegator implements Runnable {
memoryConsumption.setAverage(floatValue);
if (log.isDebugEnabled()) {
- log.debug(String.format("%s event: [member] %s [value] %s", event.getProperties().get("member_id"), value));
+ log.debug(String.format("%s event: [member] %s [value] %s", event, event.getProperties().get("member_id"), value));
}
}
} else if(Constants.MEMBER_SECOND_DERIVATIVE_OF_MEMORY_CONSUMPTION.equals(event.getEventName())) {
@@ -173,7 +175,7 @@ public class HealthEventMessageDelegator implements Runnable {
memoryConsumption.setSecondDerivative(floatValue);
if (log.isDebugEnabled()) {
- log.debug(String.format("%s event: [member] %s [value] %s", event.getProperties().get("member_id"), value));
+ log.debug(String.format("%s event: [member] %s [value] %s", event, event.getProperties().get("member_id"), value));
}
}
} else if(Constants.MEMBER_GRADIENT_MEMORY_CONSUMPTION.equals(event.getEventName())) {
@@ -184,7 +186,7 @@ public class HealthEventMessageDelegator implements Runnable {
memoryConsumption.setGradient(floatValue);
if (log.isDebugEnabled()) {
- log.debug(String.format("%s event: [member] %s [value] %s", event.getProperties().get("member_id"), value));
+ log.debug(String.format("%s event: [member] %s [value] %s",event, event.getProperties().get("member_id"), value));
}
}
[4/8] git commit: adding instance data holder to PolicyManager.
Posted by ud...@apache.org.
adding instance data holder to PolicyManager.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7065a675
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7065a675
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7065a675
Branch: refs/heads/master
Commit: 7065a6752d7f23293846a41272a272af13a19f72
Parents: d9827db
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 20 16:42:32 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 20 16:42:32 2013 -0500
----------------------------------------------------------------------
.../autoscaler/policy/PolicyManager.java | 21 +++++++-------------
1 file changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7065a675/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
index c939974..f0f4e57 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
@@ -43,26 +43,19 @@ public class PolicyManager {
private static final Log log = LogFactory.getLog(PolicyManager.class);
- private static final String asResourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.AS_POLICY_RESOURCE + "/";
-
private static Map<String, AutoscalePolicy> autoscalePolicyListMap = new HashMap<String, AutoscalePolicy>();
private static Map<String, DeploymentPolicy> deploymentPolicyListMap = new HashMap<String, DeploymentPolicy>();
-
- private static PolicyManager instance = null;
-
- private PolicyManager() {
+
+ private static class InstanceHolder {
+ private static final PolicyManager INSTANCE = new PolicyManager();
}
public static PolicyManager getInstance() {
- if (instance == null) {
- synchronized (PolicyManager.class) {
- if (instance == null) {
- instance = new PolicyManager();
- }
- }
- }
- return instance;
+ return InstanceHolder.INSTANCE;
+ }
+
+ private PolicyManager() {
}
// Add the policy to information model and persist.
[6/8] git commit: Adding deactivate method to Auto Scaler server
component
Posted by ud...@apache.org.
Adding deactivate method to Auto Scaler server component
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d0664e95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d0664e95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d0664e95
Branch: refs/heads/master
Commit: d0664e95bf0dcfe2af2677f769d89b5d707c8826
Parents: d046aea
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 20 19:07:06 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 20 19:07:06 2013 -0500
----------------------------------------------------------------------
.../internal/AutoscalerServerComponent.java | 25 +++++++++++++-------
.../health/HealthEventMessageDelegator.java | 8 ++++++-
2 files changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d0664e95/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java
index a68800b..fba11f9 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java
@@ -18,6 +18,9 @@
*/
package org.apache.stratos.autoscaler.internal;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.NetworkPartitionContext;
@@ -30,8 +33,6 @@ import org.apache.stratos.autoscaler.policy.PolicyManager;
import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
import org.apache.stratos.autoscaler.registry.RegistryManager;
import org.apache.stratos.autoscaler.topology.AutoscalerTopologyReceiver;
-import org.apache.stratos.autoscaler.util.AutoScalerConstants;
-import org.apache.stratos.autoscaler.util.Deserializer;
import org.apache.stratos.autoscaler.util.ServiceReferenceHolder;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
import org.apache.stratos.messaging.broker.subscribe.TopicSubscriber;
@@ -40,10 +41,6 @@ import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.registry.api.RegistryException;
import org.wso2.carbon.registry.core.service.RegistryService;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @scr.component name=org.apache.stratos.autoscaler.internal.AutoscalerServerComponent"
* immediate="true"
@@ -57,18 +54,22 @@ import java.util.List;
public class AutoscalerServerComponent {
private static final Log log = LogFactory.getLog(AutoscalerServerComponent.class);
+ AutoscalerTopologyReceiver asTopologyReceiver;
+ TopicSubscriber healthStatTopicSubscriber;
+ HealthEventMessageDelegator healthEventMessageDelegator;
protected void activate(ComponentContext componentContext) throws Exception {
try {
// Start topology receiver
- Thread topologyTopicSubscriberThread = new Thread(new AutoscalerTopologyReceiver());
+ asTopologyReceiver = new AutoscalerTopologyReceiver();
+ Thread topologyTopicSubscriberThread = new Thread(asTopologyReceiver);
topologyTopicSubscriberThread.start();
if (log.isDebugEnabled()) {
log.debug("Topology receiver thread started");
}
// Start health stat receiver
- TopicSubscriber healthStatTopicSubscriber = new TopicSubscriber(Constants.HEALTH_STAT_TOPIC);
+ healthStatTopicSubscriber = new TopicSubscriber(Constants.HEALTH_STAT_TOPIC);
healthStatTopicSubscriber.setMessageListener(new HealthEventMessageReceiver());
Thread healthStatTopicSubscriberThread = new Thread(healthStatTopicSubscriber);
healthStatTopicSubscriberThread.start();
@@ -76,7 +77,7 @@ public class AutoscalerServerComponent {
log.debug("Health event message receiver thread started");
}
- HealthEventMessageDelegator healthEventMessageDelegator = new HealthEventMessageDelegator();
+ healthEventMessageDelegator = new HealthEventMessageDelegator();
Thread healthDelegatorThread = new Thread(healthEventMessageDelegator);
healthDelegatorThread.start();
if (log.isDebugEnabled()) {
@@ -121,6 +122,12 @@ public class AutoscalerServerComponent {
}
}
+ protected void deactivate(ComponentContext context) {
+ asTopologyReceiver.terminate();
+ healthStatTopicSubscriber.terminate();
+ healthEventMessageDelegator.terminate();
+ }
+
protected void setRegistryService(RegistryService registryService) {
if (log.isDebugEnabled()) {
log.debug("Setting the Registry Service");
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d0664e95/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 67e6701..0fa4ccd 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
@@ -54,12 +54,13 @@ import com.google.gson.stream.JsonReader;
public class HealthEventMessageDelegator implements Runnable {
private static final Log log = LogFactory.getLog(HealthEventMessageDelegator.class);
+ private boolean terminate = false;
@Override
public void run() {
log.info("Health event message delegator started");
- while (true) {
+ while (!terminate) {
try {
TextMessage message = HealthEventQueue.getInstance().take();
@@ -207,6 +208,7 @@ public class HealthEventMessageDelegator implements Runnable {
log.error("Failed to retrieve the health stat event message.", e);
}
}
+ log.warn("Health event Message delegater is terminated");
}
private LoadAverage findLoadAverage(Event event) {
@@ -434,4 +436,8 @@ public class HealthEventMessageDelegator implements Runnable {
this.properties = properties;
}
}
+
+ public void terminate(){
+ this.terminate = true;
+ }
}
[3/8] git commit: Changing getInstance() synchronization way. Adding
instance data holder class for cloudcontrollerclient.
Posted by ud...@apache.org.
Changing getInstance() synchronization way.
Adding instance data holder class for cloudcontrollerclient.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d9827dbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d9827dbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d9827dbb
Branch: refs/heads/master
Commit: d9827dbb26cee94ae1dc529f3ba678aac78072ce
Parents: e928a42
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 20 16:36:23 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 20 16:36:23 2013 -0500
----------------------------------------------------------------------
.../cloud/controller/CloudControllerClient.java | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d9827dbb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
index 7208e87..14903d9 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
@@ -28,6 +28,7 @@ import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
import org.apache.stratos.autoscaler.exception.PartitionValidationException;
import org.apache.stratos.autoscaler.exception.SpawningException;
import org.apache.stratos.autoscaler.exception.TerminationException;
+import org.apache.stratos.autoscaler.policy.PolicyManager;
import org.apache.stratos.autoscaler.util.ConfUtil;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
import org.apache.stratos.cloud.controller.pojo.MemberContext;
@@ -43,20 +44,13 @@ public class CloudControllerClient {
private static final Log log = LogFactory.getLog(CloudControllerClient.class);
private static CloudControllerServiceStub stub;
- private static CloudControllerClient instance;
+
+ private static class InstanceHolder {
+ private static final CloudControllerClient INSTANCE = new CloudControllerClient();
+ }
public static CloudControllerClient getInstance() {
-
- if (instance == null) {
- synchronized (CloudControllerClient.class) {
-
- if(instance == null) {
- instance = new CloudControllerClient();
- }
- }
- }
-
- return instance;
+ return InstanceHolder.INSTANCE;
}
private CloudControllerClient(){
Re: [5/8] git commit: removing serializability from the network
partitioncontext and partition context since it is not serialized.
Posted by Sajith Kariyawasam <sa...@wso2.com>.
On 20 Dec 2013 20:21, "Udara Liyanage" <ud...@wso2.com> wrote:
>
> Oh sorry. I did not see it. This was suggested by find bug.
Each and every suggestion made by find bugs (or checkstyle) may not be
applicable for every project. so the best thing is to come up with a
customized rule set, and use it locally to check for violations before
committing the code. Do we have any templates? Does jenkins integrated with
findbugs.? If so we can use that rule set configured there
> I will fix it
>
>
> On Fri, Dec 20, 2013 at 9:20 AM, Nirmal Fernando <ni...@gmail.com>
wrote:
>>
>> Hi Udara,
>>
>> Are you sure about this? Aren't we persisting these in registry?
>>
>>
>> On Friday, December 20, 2013, wrote:
>>>
>>> removing serializability from the network partitioncontext and
partition context since it is not serialized.
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
>>> Commit:
http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d046aea3
>>> Tree:
http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d046aea3
>>> Diff:
http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d046aea3
>>>
>>> Branch: refs/heads/master
>>> Commit: d046aea387c6ae3663b630c16e20b52f6bf1c503
>>> Parents: 7065a67
>>> Author: Udara Liyanage <ud...@wso2.com>
>>> Authored: Fri Dec 20 18:30:00 2013 -0500
>>> Committer: Udara Liyanage <ud...@wso2.com>
>>> Committed: Fri Dec 20 19:05:04 2013 -0500
>>>
>>> ----------------------------------------------------------------------
>>> .../org/apache/stratos/autoscaler/NetworkPartitionContext.java | 3
+--
>>> .../main/java/org/apache/stratos/autoscaler/PartitionContext.java | 3
+--
>>> 2 files changed, 2 insertions(+), 4 deletions(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d046aea3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
>>> ----------------------------------------------------------------------
>>> diff --git
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
>>> index f5eab01..e902fff 100644
>>> ---
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
>>> +++
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
>>> @@ -30,9 +30,8 @@ import java.util.Map;
>>> * Holds runtime data of a network partition.
>>> *
>>> */
>>> -public class NetworkPartitionContext implements Serializable {
>>> +public class NetworkPartitionContext{
>>>
>>> - private static final long serialVersionUID = -5458149704820463584L;
>>> private static final Log log =
LogFactory.getLog(NetworkPartitionContext.class);
>>> private String id;
>>>
>>>
>>>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d046aea3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
>>> ----------------------------------------------------------------------
>>> diff --git
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
>>> index 96dc2bd..e60d855 100644
>>> ---
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
>>> +++
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
>>> @@ -40,9 +40,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
>>> *
>>> */
>>>
>>> -public class PartitionContext implements Serializable{
>>> +public class PartitionContext{
>>>
>>> - private static final long serialVersionUID = 5822689534291741272L;
>>> private static final Log log =
LogFactory.getLog(PartitionContext.class);
>>> private String partitionId;
>>> private String serviceName;
>>>
>>
>>
>> --
>> Best Regards,
>> Nirmal
>>
>> Nirmal Fernando.
>> PPMC Member & Committer of Apache Stratos,
>> Senior Software Engineer, WSO2 Inc.
>>
>> Blog: http://nirmalfdo.blogspot.com/
>>
>
>
>
> --
> Udara Liyanage
> Software Engineer
> WSO2, Inc.: http://wso2.com
> lean. enterprise. middleware
>
> web: http://udaraliyanage.wordpress.com
> phone: +94 71 443 6897
Re: [5/8] git commit: removing serializability from the network
partitioncontext and partition context since it is not serialized.
Posted by Udara Liyanage <ud...@wso2.com>.
Oh sorry. I did not see it. This was suggested by find bug.
I will fix it
On Fri, Dec 20, 2013 at 9:20 AM, Nirmal Fernando <ni...@gmail.com>wrote:
> Hi Udara,
>
> Are you sure about this? Aren't we persisting these in registry?
>
>
> On Friday, December 20, 2013, wrote:
>
>> removing serializability from the network partitioncontext and partition
>> context since it is not serialized.
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
>> Commit:
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d046aea3
>> Tree:
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d046aea3
>> Diff:
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d046aea3
>>
>> Branch: refs/heads/master
>> Commit: d046aea387c6ae3663b630c16e20b52f6bf1c503
>> Parents: 7065a67
>> Author: Udara Liyanage <ud...@wso2.com>
>> Authored: Fri Dec 20 18:30:00 2013 -0500
>> Committer: Udara Liyanage <ud...@wso2.com>
>> Committed: Fri Dec 20 19:05:04 2013 -0500
>>
>> ----------------------------------------------------------------------
>> .../org/apache/stratos/autoscaler/NetworkPartitionContext.java | 3 +--
>> .../main/java/org/apache/stratos/autoscaler/PartitionContext.java | 3 +--
>> 2 files changed, 2 insertions(+), 4 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d046aea3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
>> b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
>> index f5eab01..e902fff 100644
>> ---
>> a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
>> +++
>> b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
>> @@ -30,9 +30,8 @@ import java.util.Map;
>> * Holds runtime data of a network partition.
>> *
>> */
>> -public class NetworkPartitionContext implements Serializable {
>> +public class NetworkPartitionContext{
>>
>> - private static final long serialVersionUID = -5458149704820463584L;
>> private static final Log log =
>> LogFactory.getLog(NetworkPartitionContext.class);
>> private String id;
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d046aea3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
>> b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
>> index 96dc2bd..e60d855 100644
>> ---
>> a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
>> +++
>> b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
>> @@ -40,9 +40,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
>> *
>> */
>>
>> -public class PartitionContext implements Serializable{
>> +public class PartitionContext{
>>
>> - private static final long serialVersionUID = 5822689534291741272L;
>> private static final Log log =
>> LogFactory.getLog(PartitionContext.class);
>> private String partitionId;
>> private String serviceName;
>>
>>
>
> --
> Best Regards,
> Nirmal
>
> Nirmal Fernando.
> PPMC Member & Committer of Apache Stratos,
> Senior Software Engineer, WSO2 Inc.
>
> Blog: http://nirmalfdo.blogspot.com/
>
>
--
Udara Liyanage
Software Engineer
WSO2, Inc.: http://wso2.com
lean. enterprise. middleware
web: http://udaraliyanage.wordpress.com
phone: +94 71 443 6897
Re: [5/8] git commit: removing serializability from the network
partitioncontext and partition context since it is not serialized.
Posted by Nirmal Fernando <ni...@gmail.com>.
Hi Udara,
Are you sure about this? Aren't we persisting these in registry?
On Friday, December 20, 2013, wrote:
> removing serializability from the network partitioncontext and partition
> context since it is not serialized.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d046aea3
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d046aea3
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d046aea3
>
> Branch: refs/heads/master
> Commit: d046aea387c6ae3663b630c16e20b52f6bf1c503
> Parents: 7065a67
> Author: Udara Liyanage <udara@wso2.com <javascript:;>>
> Authored: Fri Dec 20 18:30:00 2013 -0500
> Committer: Udara Liyanage <udara@wso2.com <javascript:;>>
> Committed: Fri Dec 20 19:05:04 2013 -0500
>
> ----------------------------------------------------------------------
> .../org/apache/stratos/autoscaler/NetworkPartitionContext.java | 3 +--
> .../main/java/org/apache/stratos/autoscaler/PartitionContext.java | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d046aea3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
> b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
> index f5eab01..e902fff 100644
> ---
> a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
> +++
> b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
> @@ -30,9 +30,8 @@ import java.util.Map;
> * Holds runtime data of a network partition.
> *
> */
> -public class NetworkPartitionContext implements Serializable {
> +public class NetworkPartitionContext{
>
> - private static final long serialVersionUID = -5458149704820463584L;
> private static final Log log =
> LogFactory.getLog(NetworkPartitionContext.class);
> private String id;
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d046aea3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
> b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
> index 96dc2bd..e60d855 100644
> ---
> a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
> +++
> b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
> @@ -40,9 +40,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
> *
> */
>
> -public class PartitionContext implements Serializable{
> +public class PartitionContext{
>
> - private static final long serialVersionUID = 5822689534291741272L;
> private static final Log log =
> LogFactory.getLog(PartitionContext.class);
> private String partitionId;
> private String serviceName;
>
>
--
Best Regards,
Nirmal
Nirmal Fernando.
PPMC Member & Committer of Apache Stratos,
Senior Software Engineer, WSO2 Inc.
Blog: http://nirmalfdo.blogspot.com/
[5/8] git commit: removing serializability from the network
partitioncontext and partition context since it is not serialized.
Posted by ud...@apache.org.
removing serializability from the network partitioncontext and partition context since it is not serialized.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d046aea3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d046aea3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d046aea3
Branch: refs/heads/master
Commit: d046aea387c6ae3663b630c16e20b52f6bf1c503
Parents: 7065a67
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 20 18:30:00 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 20 19:05:04 2013 -0500
----------------------------------------------------------------------
.../org/apache/stratos/autoscaler/NetworkPartitionContext.java | 3 +--
.../main/java/org/apache/stratos/autoscaler/PartitionContext.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d046aea3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
index f5eab01..e902fff 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
@@ -30,9 +30,8 @@ import java.util.Map;
* Holds runtime data of a network partition.
*
*/
-public class NetworkPartitionContext implements Serializable {
+public class NetworkPartitionContext{
- private static final long serialVersionUID = -5458149704820463584L;
private static final Log log = LogFactory.getLog(NetworkPartitionContext.class);
private String id;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d046aea3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
index 96dc2bd..e60d855 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
@@ -40,9 +40,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
*
*/
-public class PartitionContext implements Serializable{
+public class PartitionContext{
- private static final long serialVersionUID = 5822689534291741272L;
private static final Log log = LogFactory.getLog(PartitionContext.class);
private String partitionId;
private String serviceName;
[2/8] git commit: adding missing argument printing in
NetworkPartitionContext.java
Posted by ud...@apache.org.
adding missing argument printing in NetworkPartitionContext.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e928a428
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e928a428
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e928a428
Branch: refs/heads/master
Commit: e928a4280d784892dda66a2e6ccf942c9b600bef
Parents: dd98d63
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 20 14:57:33 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 20 14:57:33 2013 -0500
----------------------------------------------------------------------
.../org/apache/stratos/autoscaler/NetworkPartitionContext.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e928a428/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
index b809cea..f5eab01 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
@@ -231,7 +231,7 @@ public class NetworkPartitionContext implements Serializable {
if(secondDerivativeRifRest && gradientRifReset){
rifReset = true;
if(log.isDebugEnabled()){
- log.debug(String.format("Requests in flights stats are reset, ready to do scale check [network partition] "
+ log.debug(String.format("Requests in flights stats are reset, ready to do scale check [network partition] %s"
, this.id));
}
}
@@ -247,7 +247,7 @@ public class NetworkPartitionContext implements Serializable {
if(averageRifReset && gradientRifReset){
rifReset = true;
if(log.isDebugEnabled()){
- log.debug(String.format("Requests in flights stats are reset, ready to do scale check [network partition] "
+ log.debug(String.format("Requests in flights stats are reset, ready to do scale check [network partition] %s"
, this.id));
}
}
@@ -263,7 +263,7 @@ public class NetworkPartitionContext implements Serializable {
if(secondDerivativeRifRest && averageRifReset){
rifReset = true;
if(log.isDebugEnabled()){
- log.debug(String.format("Requests in flights stats are reset, ready to do scale check [network partition] "
+ log.debug(String.format("Requests in flights stats are reset, ready to do scale check [network partition] %s"
, this.id));
}
}
[7/8] git commit: fixing findbug issues on toString methods
Posted by ud...@apache.org.
fixing findbug issues on toString methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3bb2e474
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3bb2e474
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3bb2e474
Branch: refs/heads/master
Commit: 3bb2e47461cfad6a6376f35fe044720fa947085c
Parents: d0664e9
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 20 19:10:04 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 20 19:25:47 2013 -0500
----------------------------------------------------------------------
.../client/cloud/controller/CloudControllerClient.java | 4 ++++
.../autoscaler/deployment/policy/DeploymentPolicy.java | 5 ++---
.../org/apache/stratos/autoscaler/policy/PolicyManager.java | 9 +++++----
.../apache/stratos/autoscaler/registry/RegistryManager.java | 6 ++----
4 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bb2e474/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
index 14903d9..11c5500 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
@@ -45,6 +45,10 @@ public class CloudControllerClient {
private static final Log log = LogFactory.getLog(CloudControllerClient.class);
private static CloudControllerServiceStub stub;
+ /* An instance of a CloudControllerClient is created when the class is loaded.
+ * Since the class is loaded only once, it is guaranteed that an object of
+ * CloudControllerClient is created only once. Hence it is singleton.
+ */
private static class InstanceHolder {
private static final CloudControllerClient INSTANCE = new CloudControllerClient();
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bb2e474/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
index d930cb6..cedc716 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
@@ -63,8 +63,7 @@ public class DeploymentPolicy implements Serializable{
this.partitionGroups = groups;
}
- @SuppressWarnings("unchecked")
- public Partition[] getAllPartitions() {
+ public Partition[] getAllPartitions() {
ArrayList<Partition> partitionslist = new ArrayList<Partition>();
for (PartitionGroup partitionGroup : this.getPartitionGroups()) {
Partition[] partitions = partitionGroup.getPartitions();
@@ -101,7 +100,7 @@ public class DeploymentPolicy implements Serializable{
}
public String toString() {
- return "Deployment Policy: " + this.id;
+ return "Deployment Policy [id]" + this.id + " [partitions] " + Arrays.toString(this.getAllPartitions());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bb2e474/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
index f0f4e57..3d21996 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
@@ -19,10 +19,7 @@
package org.apache.stratos.autoscaler.policy;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
@@ -33,7 +30,6 @@ import org.apache.stratos.autoscaler.exception.InvalidPolicyException;
import org.apache.stratos.autoscaler.partition.PartitionManager;
import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
import org.apache.stratos.autoscaler.registry.RegistryManager;
-import org.apache.stratos.autoscaler.util.AutoScalerConstants;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
/**
@@ -47,6 +43,11 @@ public class PolicyManager {
private static Map<String, DeploymentPolicy> deploymentPolicyListMap = new HashMap<String, DeploymentPolicy>();
+ /* An instance of a PolicyManager is created when the class is loaded.
+ * Since the class is loaded only once, it is guaranteed that an object of
+ * PolicyManager is created only once. Hence it is singleton.
+ */
+
private static class InstanceHolder {
private static final PolicyManager INSTANCE = new PolicyManager();
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bb2e474/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
index 9a40c83..f886a6c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
@@ -114,8 +114,7 @@ public class RegistryManager {
String resourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.DEPLOYMENT_POLICY_RESOURCE + "/" + deploymentPolicy.getId();
persist(deploymentPolicy, resourcePath);
if(log.isDebugEnabled()) {
- log.debug(String.format("Deployment policy written to registry: [id] %s [partitions] %s",
- deploymentPolicy.getId(), deploymentPolicy.getAllPartitions()));
+ log.debug(deploymentPolicy.toString());
}
}
@@ -248,8 +247,7 @@ public class RegistryManager {
if (dataObj instanceof DeploymentPolicy) {
depPolicy = (DeploymentPolicy) dataObj;
if(log.isDebugEnabled()) {
- log.debug(String.format("Deployment policy read from registry: [id] %s [partitions] %s",
- depPolicy.getId(), depPolicy.getAllPartitions()));
+ log.debug(depPolicy.toString());
}
depPolicyList.add(depPolicy);
} else {
[8/8] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ce67fc1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ce67fc1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ce67fc1f
Branch: refs/heads/master
Commit: ce67fc1f9b1d553da51a3a6c33bad2832c7c2771
Parents: 3bb2e47 9e5d981
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 20 19:26:05 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 20 19:30:00 2013 -0500
----------------------------------------------------------------------
.../cloud/controller/CloudControllerClient.java | 1 -
.../topology/AutoscalerTopologyReceiver.java | 8 +-
.../apache/stratos/cartridge/agent/Main.java | 3 +
.../publisher/CartridgeAgentEventPublisher.java | 78 ++++---
.../publisher/HealthStatisticsNotifier.java | 10 +-
.../publisher/HealthStatisticsPublisher.java | 11 +-
.../java/org/apache/stratos/cli/RestClient.java | 52 +----
.../stratos/cli/RestCommandLineService.java | 60 ++---
.../publisher/WSO2CEPStatisticsPublisher.java | 10 +-
.../conf/configurator/CEPConfigurator.java | 2 +-
.../health/stat/AverageLoadAverageEvent.java | 29 +--
.../stat/AverageMemoryConsumptionEvent.java | 29 +--
.../stat/AverageRequestsInFlightEvent.java | 28 +--
.../health/stat/GradientOfLoadAverageEvent.java | 28 +--
.../stat/GradientOfMemoryConsumptionEvent.java | 28 +--
.../stat/GradientOfRequestsInFlightEvent.java | 28 +--
.../event/health/stat/HealthStatEvent.java | 32 +++
.../stat/MemberAverageLoadAverageEvent.java | 21 +-
.../MemberAverageMemoryConsumptionEvent.java | 20 +-
.../event/health/stat/MemberFaultEvent.java | 35 +--
.../stat/MemberGradientOfLoadAverageEvent.java | 21 +-
.../MemberGradientOfMemoryConsumptionEvent.java | 21 +-
...emberSecondDerivativeOfLoadAverageEvent.java | 21 +-
...econdDerivativeOfMemoryConsumptionEvent.java | 21 +-
.../SecondDerivativeOfLoadAverageEvent.java | 29 +--
...econdDerivativeOfMemoryConsumptionEvent.java | 21 +-
...SecondDerivativeOfRequestsInFlightEvent.java | 28 +--
.../stat/AverageLoadAverageEventListener.java | 28 +++
.../AverageMemoryConsumptionEventListener.java | 28 +++
.../AverageRequestsInFlightEventListener.java | 28 +++
.../GradientOfLoadAverageEventListener.java | 28 +++
...radientOfMemoryConsumptionEventListener.java | 28 +++
...GradientOfRequestsInFlightEventListener.java | 28 +++
.../MemberAverageLoadAverageEventListener.java | 29 +++
...erAverageMemoryConsumptionEventListener.java | 28 +++
.../health/stat/MemberFaultEventListener.java | 28 +++
...emberGradientOfLoadAverageEventListener.java | 48 ++++
...radientOfMemoryConsumptionEventListener.java | 28 +++
...ondDerivativeOfLoadAverageEventListener.java | 28 +++
...ivativeOfMemoryConsumptionEventListener.java | 28 +++
...ondDerivativeOfLoadAverageEventListener.java | 28 +++
...ivativeOfMemoryConsumptionEventListener.java | 28 +++
...rivativeOfRequestsInFlightEventListener.java | 28 +++
.../tenant/TenantRemovedEventListener.java | 7 +-
.../topology/ClusterCreatedEventListener.java | 6 +-
.../topology/ClusterRemovedEventListener.java | 6 +-
.../topology/CompleteTopologyEventListener.java | 6 +-
.../topology/InstanceSpawnedEventListener.java | 6 +-
.../topology/MemberActivatedEventListener.java | 6 +-
.../topology/MemberStartedEventListener.java | 6 +-
.../topology/MemberSuspendedEventListener.java | 7 +-
.../topology/MemberTerminatedEventListener.java | 6 +-
.../topology/ServiceCreatedEventListener.java | 6 +-
.../topology/ServiceRemovedEventListener.java | 6 +-
.../AverageLoadAverageMessageProcessor.java | 66 ++++++
...verageMemoryConsumptionMessageProcessor.java | 66 ++++++
...AverageRequestsInFlightMessageProcessor.java | 66 ++++++
.../GradientOfLoadAverageMessageProcessor.java | 66 ++++++
...ientOfMemoryConsumptionMessageProcessor.java | 65 ++++++
...dientOfRequestsInFlightMessageProcessor.java | 66 ++++++
...emberAverageLoadAverageMessageProcessor.java | 66 ++++++
...verageMemoryConsumptionMessageProcessor.java | 66 ++++++
.../stat/MemberFaultMessageProcessor.java | 66 ++++++
...erGradientOfLoadAverageMessageProcessor.java | 66 ++++++
...ientOfMemoryConsumptionMessageProcessor.java | 67 ++++++
...DerivativeOfLoadAverageMessageProcessor.java | 66 ++++++
...tiveOfMemoryConsumptionMessageProcessor.java | 66 ++++++
...DerivativeOfLoadAverageMessageProcessor.java | 66 ++++++
...tiveOfMemoryConsumptionMessageProcessor.java | 66 ++++++
...ativeOfRequestsInFlightMessageProcessor.java | 66 ++++++
.../src/main/bin/haproxy-extension.sh | 2 +-
.../src/main/bin/cartridge-agent.sh | 11 +-
.../modules/scripts/ec2/cartridge-agent.sh | 100 ++++++++
.../modules/scripts/ec2/clean.sh | 20 ++
.../modules/scripts/ec2/get-launch-params.rb | 54 +++++
.../ec2/load-balancer/cartridge-agent.sh | 51 ++---
.../scripts/ec2/mysql/cartridge-agent.sh | 142 ------------
.../modules/scripts/ec2/mysql/clean.sh | 33 ---
.../scripts/ec2/mysql/get-launch-params.rb | 54 -----
.../modules/scripts/ec2/mysql/healthcheck.sh | 33 ---
.../modules/scripts/ec2/php/cartridge-agent.sh | 86 -------
.../modules/scripts/ec2/php/clean.sh | 39 ----
.../scripts/ec2/php/get-launch-params.rb | 54 -----
.../modules/scripts/ec2/php/healthcheck.sh | 33 ---
.../scripts/ec2/tomcat/cartridge-agent.sh | 227 -------------------
.../modules/scripts/ec2/tomcat/clean.sh | 39 ----
.../scripts/ec2/tomcat/get-launch-params.rb | 54 -----
.../modules/scripts/ec2/tomcat/healthcheck.sh | 33 ---
88 files changed, 2040 insertions(+), 1293 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ce67fc1f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
----------------------------------------------------------------------