You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/01/18 19:43:21 UTC
[1/2] git commit: Fixing maformed format error at a log
Updated Branches:
refs/heads/master 6fdb07704 -> 3ce7f9fff
Fixing maformed format error at a log
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/44719b75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/44719b75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/44719b75
Branch: refs/heads/master
Commit: 44719b75c5af4467721ab0919b461e39f7451b05
Parents: f7dab5f
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sat Jan 18 22:48:21 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sat Jan 18 22:48:21 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/algorithm/OneAfterAnother.java | 8 ++++----
.../org/apache/stratos/autoscaler/algorithm/RoundRobin.java | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/44719b75/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java
index b3d8d0d..75404c0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java
@@ -48,7 +48,7 @@ public class OneAfterAnother implements AutoscaleAlgorithm {
try {
if (log.isDebugEnabled())
- log.debug(String.format("Searching for a partition to up down %s [network partition] %s",
+ log.debug(String.format("Searching for a partition to up down [network partition] %s",
networkPartitionContext.getId())) ;
int currentPartitionIndex = networkPartitionContext.getCurrentPartitionIndex();
List<?> partitions = Arrays.asList(networkPartitionContext.getPartitions());
@@ -83,7 +83,7 @@ public class OneAfterAnother implements AutoscaleAlgorithm {
if (log.isDebugEnabled())
log.debug(String.format("No free partition found at network partition %s" , networkPartitionContext));
} catch (Exception e) {
- log.error("Could not find next scale up partition", e);
+ log.error("Error occurred while searching for next scale up partition", e);
}
return null;
}
@@ -93,7 +93,7 @@ public class OneAfterAnother implements AutoscaleAlgorithm {
try {
if (log.isDebugEnabled())
- log.debug(String.format("Searching for a partition to scale down %s [network partition] %s",
+ log.debug(String.format("Searching for a partition to scale down [network partition] %s",
networkPartitionContext.getId())) ;
int currentPartitionIndex = networkPartitionContext.getCurrentPartitionIndex();
List<?> partitions = Arrays.asList(networkPartitionContext.getPartitions());
@@ -130,7 +130,7 @@ public class OneAfterAnother implements AutoscaleAlgorithm {
if (log.isDebugEnabled())
log.debug("No space found in this network partition " + networkPartitionContext.getId());
} catch (Exception e) {
- log.error("Could not find next scale down partition", e);
+ log.error("Error occurred while searching for scale down partition", e);
}
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/44719b75/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java
index aa9b0bb..ebbb9c3 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/RoundRobin.java
@@ -40,7 +40,7 @@ public class RoundRobin implements AutoscaleAlgorithm{
try{
if (log.isDebugEnabled())
- log.debug(String.format("Searching for a partition to scale up %s [network partition] %s",
+ log.debug(String.format("Searching for a partition to scale up [network partition] %s",
networkPartitionContext.getId())) ;
List<?> partitions = Arrays.asList(networkPartitionContext.getPartitions());
int noOfPartitions = partitions.size();
@@ -76,7 +76,7 @@ public class RoundRobin implements AutoscaleAlgorithm{
log.debug("No free partition found at network partition " + networkPartitionContext);
}
} catch (Exception e) {
- log.error("Could not find next scale up partition", e);
+ log.error("Error occurred while searching for next scale up partition", e);
}
return null;
}
@@ -86,7 +86,7 @@ public class RoundRobin implements AutoscaleAlgorithm{
public Partition getNextScaleDownPartition(NetworkPartitionContext networkPartitionContext, String clusterId) {
try{
if (log.isDebugEnabled())
- log.debug(String.format("Searching for a partition to scale up %s [network partition] %s",
+ log.debug(String.format("Searching for a partition to scale up [network partition] %s",
networkPartitionContext.getId())) ;
List<?> partitions = Arrays.asList(networkPartitionContext.getPartitions());
int noOfPartitions = partitions.size();
@@ -137,7 +137,7 @@ public class RoundRobin implements AutoscaleAlgorithm{
// none of the partitions were free.
} catch (Exception e) {
- log.error("Could not find next scale up partition", e);
+ log.error("Error occurred while searching for next scale down partition", e);
}
return null;
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@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/3ce7f9ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3ce7f9ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3ce7f9ff
Branch: refs/heads/master
Commit: 3ce7f9fff7ffcc9e6f7d153a91d04c397fc22ff7
Parents: 44719b7 6fdb077
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Jan 19 00:04:50 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Jan 19 00:04:50 2014 +0530
----------------------------------------------------------------------
.../listener/InstanceStatusListener.java | 2 +-
.../manager/lookup/ClusterIdToSubscription.java | 5 +-
.../manager/lookup/LookupDataHolder.java | 11 +-
.../manager/lookup/SubscriptionContext.java | 7 +-
.../lookup/TenantIdToSubscriptionContext.java | 2 +-
.../manager/CartridgeSubscriptionManager.java | 6 +-
.../DatabaseBasedPersistenceManager.java | 2 +-
.../manager/persistence/PersistenceManager.java | 4 +-
.../RegistryBasedPersistenceManager.java | 4 +-
.../DataInsertionAndRetrievalManager.java | 51 +++-
.../service/ApplicationManagementService.java | 2 +-
.../StratosManagerTopologyReceiver.java | 2 +-
.../manager/test/CartridgeSubscriptionTest.java | 72 +++--
.../manager/test/LookupDataHolderTest.java | 282 +++++++++++++++++++
.../stratos/manager/test/PolicyHolderTest.java | 168 +++++------
15 files changed, 488 insertions(+), 132 deletions(-)
----------------------------------------------------------------------