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/25 11:24:02 UTC
[1/2] git commit: Refined topology synchronization task logic and
added logs
Updated Branches:
refs/heads/master 096398a5d -> 2e2e0cbda
Refined topology synchronization task logic and added logs
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/807548d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/807548d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/807548d6
Branch: refs/heads/master
Commit: 807548d65d84dfac0af7a6e26d597e288af9ec26
Parents: c03a42a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 25 15:53:43 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 25 15:53:43 2013 +0530
----------------------------------------------------------------------
.../impl/CloudControllerServiceImpl.java | 37 +++++++++++---------
.../topology/TopologySynchronizerTask.java | 19 ++++++----
2 files changed, 33 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/807548d6/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 2340abe..7fd2573 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -89,36 +89,41 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
private void registerAndScheduleTopologySyncerTask(TaskService taskService) {
- TaskInfo taskInfo;
+ TaskInfo taskInfo;
TaskManager tm = null;
- try {
-
- if (!taskService.getRegisteredTaskTypes().contains(
- CloudControllerConstants.TOPOLOGY_SYNC_TASK_TYPE)) {
- // topology sync
- taskService
- .registerTaskType(CloudControllerConstants.TOPOLOGY_SYNC_TASK_TYPE);
+ try {
+ if(log.isDebugEnabled()) {
+ log.debug("Scheduling topology synchronization task");
+ }
- tm = taskService
- .getTaskManager(CloudControllerConstants.TOPOLOGY_SYNC_TASK_TYPE);
-
+ if (!taskService.getRegisteredTaskTypes().contains(CloudControllerConstants.TOPOLOGY_SYNC_TASK_TYPE)) {
+ taskService.registerTaskType(CloudControllerConstants.TOPOLOGY_SYNC_TASK_TYPE);
+ tm = taskService.getTaskManager(CloudControllerConstants.TOPOLOGY_SYNC_TASK_TYPE);
String cron = dataHolder.getTopologyConfig().getProperty(CloudControllerConstants.CRON_ELEMENT);
-
cron = ( cron == null ? CloudControllerConstants.PUB_CRON_EXPRESSION : cron );
-
+ if(log.isDebugEnabled()) {
+ log.debug(String.format("Topology synchronization task cron: %s", cron));
+ }
TriggerInfo triggerInfo = new TriggerInfo(cron);
taskInfo = new TaskInfo(
CloudControllerConstants.TOPOLOGY_SYNC_TASK_NAME,
TopologySynchronizerTask.class.getName(),
new HashMap<String, String>(), triggerInfo);
tm.registerTask(taskInfo);
+ if(log.isDebugEnabled()) {
+ log.debug("Topology synchronization task registered");
+ }
}
+ else {
+ if(log.isWarnEnabled()) {
+ log.warn("Topology synchronization task already exists");
+ }
+ }
} catch (Exception e) {
- String msg = "Error scheduling task: "
- + CloudControllerConstants.TOPOLOGY_SYNC_TASK_NAME;
- log.error(msg, e);
+ String msg = "Error scheduling task: " + CloudControllerConstants.TOPOLOGY_SYNC_TASK_NAME;
+ log.error(msg);
if (tm != null) {
try {
tm.deleteTask(CloudControllerConstants.TOPOLOGY_SYNC_TASK_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/807548d6/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
index 6c5a1c7..af1842d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
@@ -30,15 +30,18 @@ public class TopologySynchronizerTask implements Task{
@Override
public void execute() {
- if(FasterLookUpDataHolder.getInstance().isTopologySyncRunning()||
+ if (log.isDebugEnabled()) {
+ log.debug("Executing topology synchronization task");
+ }
+
+ if(FasterLookUpDataHolder.getInstance().isTopologySyncRunning() ||
// this is a temporary fix to avoid task execution - limitation with ntask
- !FasterLookUpDataHolder.getInstance().getEnableTopologySync()){
+ (!FasterLookUpDataHolder.getInstance().getEnableTopologySync())){
+ if(log.isWarnEnabled()) {
+ log.warn("Topology synchronization is disabled.");
+ }
return;
}
-
- if (log.isDebugEnabled()) {
- log.debug("TopologySynchronizerTask ...");
- }
// publish to the topic
if (TopologyManager.getTopology() != null) {
@@ -51,7 +54,9 @@ public class TopologySynchronizerTask implements Task{
// this is a temporary fix to avoid task execution - limitation with ntask
if(!FasterLookUpDataHolder.getInstance().getEnableTopologySync()){
- log.debug("Topology Sync is disabled.");
+ if(log.isWarnEnabled()) {
+ log.warn("Topology synchronization is disabled.");
+ }
return;
}
}
[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/2e2e0cbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2e2e0cbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2e2e0cbd
Branch: refs/heads/master
Commit: 2e2e0cbda9b93e2af8b553611dc8fa18aeb73b0f
Parents: 807548d 096398a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 25 15:53:55 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 25 15:53:55 2013 +0530
----------------------------------------------------------------------
.../autoscaler/NetworkPartitionContext.java | 78 ++++++++++----------
.../stratos/autoscaler/PartitionContext.java | 14 ++--
.../autoscaler/algorithm/OneAfterAnother.java | 14 ++--
.../autoscaler/algorithm/RoundRobin.java | 25 +++----
.../topology/AutoscalerTopologyReceiver.java | 10 ++-
.../stratos/autoscaler/util/AutoscalerUtil.java | 10 ++-
.../distribution/src/main/conf/mincheck.drl | 2 +-
7 files changed, 81 insertions(+), 72 deletions(-)
----------------------------------------------------------------------