You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2015/12/22 05:31:26 UTC
[8/8] stratos git commit: fixing conflicts in asyncschedulertask.py
fixing conflicts in asyncschedulertask.py
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/418ed02e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/418ed02e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/418ed02e
Branch: refs/heads/master
Commit: 418ed02e85b530a3ee296643b8c5947ae1a5d1cc
Parents: d296b2d a760c06
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Dec 22 10:00:53 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Tue Dec 22 10:00:53 2015 +0530
----------------------------------------------------------------------
.../cartridge/agent/util/ExtensionUtils.java | 4 +-
.../messaging/domain/topology/Topology.java | 19 +-
...licationClustersCreatedMessageProcessor.java | 3 +-
...licationClustersRemovedMessageProcessor.java | 3 +-
.../ClusterCreatedMessageProcessor.java | 3 +-
.../ClusterInstanceActivatedProcessor.java | 3 +-
.../ClusterInstanceCreatedMessageProcessor.java | 3 +-
.../ClusterInstanceInactivateProcessor.java | 3 +-
.../ClusterInstanceTerminatedProcessor.java | 3 +-
.../ClusterInstanceTerminatingProcessor.java | 3 +-
.../ClusterRemovedMessageProcessor.java | 3 +-
.../topology/ClusterResetMessageProcessor.java | 3 +-
.../CompleteTopologyMessageProcessor.java | 5 +-
.../MemberActivatedMessageProcessor.java | 3 +-
.../topology/MemberCreatedMessageProcessor.java | 3 +-
.../MemberInitializedMessageProcessor.java | 3 +-
.../MemberMaintenanceModeProcessor.java | 3 +-
.../MemberReadyToShutdownMessageProcessor.java | 3 +-
.../topology/MemberStartedMessageProcessor.java | 3 +-
.../MemberSuspendedMessageProcessor.java | 3 +-
.../MemberTerminatedMessageProcessor.java | 3 +-
.../ServiceCreatedMessageProcessor.java | 3 +-
.../ServiceRemovedMessageProcessor.java | 3 +-
.../receiver/topology/TopologyManager.java | 10 +
.../README.md | 53 +-
.../pom.xml | 38 --
.../cartridge.agent/cartridge.agent/agent.conf | 2 +
.../cartridge.agent/cartridge.agent/agent.py | 46 +-
.../cartridge.agent/cartridge.agent/config.py | 37 +-
.../cartridge.agent/constants.py | 2 +
.../cartridge.agent/cartridge.agent/entity.py | 2 +
.../extensions/bash/CreateLVSDummyInterface.sh | 6 +-
.../cartridge.agent/healthstats.py | 4 +
.../cartridge.agent/logpublisher.py | 14 +-
.../modules/artifactmgt/git/agentgithandler.py | 5 +
.../modules/event/eventhandler.py | 42 +-
.../modules/util/asyncscheduledtask.py | 10 +
.../cartridge.agent/publisher.py | 5 +-
.../cartridge.agent/subscriber.py | 77 +--
.../cartridge.agent/terminator.txt | 0
.../python/cartridge.agent/tests/__init__.py | 16 -
.../tests/conf/complete_topology_event.json | 1 -
.../tests/conf/git/auth_repo.json | 10 -
.../tests/conf/git/auth_repo2.json | 10 -
.../tests/conf/git/simple_repo.json | 10 -
.../python/cartridge.agent/tests/test_events.py | 125 -----
.../python/cartridge.agent/tests/test_git.py | 79 ---
.../python/cartridge.agent/tests/test_util.py | 127 -----
.../test/PythonCartridgeAgentTest.java | 529 -------------------
.../extension/FaultHandlingWindowProcessor.java | 2 +-
.../extension/FaultHandlingWindowProcessor.java | 2 +-
.../integration/tests/ADCExtensionTestCase.java | 2 +-
.../agent/integration/tests/ADCTestCase.java | 3 +-
.../tests/ADCValidationTestCase.java | 2 +-
.../AgentConfBackwardCompatibilityTestCase.java | 140 +++++
.../tests/AgentTerminationTestCase.java | 186 +++++++
.../tests/MessageBrokerHATestCase.java | 1 +
.../tests/PythonAgentIntegrationTest.java | 3 +-
.../agent.conf | 48 ++
.../logging.ini | 52 ++
.../payload/launch-params | 1 +
.../AgentTerminationTestCase/agent.conf | 46 ++
.../AgentTerminationTestCase/logging.ini | 52 ++
.../payload/launch-params | 1 +
.../test-conf/integration-test.properties | 2 +-
.../src/test/resources/test-suite-ha.xml | 38 ++
.../integration/common/TopologyHandler.java | 6 +-
67 files changed, 851 insertions(+), 1084 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/418ed02e/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/agent.conf
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/418ed02e/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/config.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/418ed02e/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/constants.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/418ed02e/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/artifactmgt/git/agentgithandler.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/418ed02e/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/asyncscheduledtask.py
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/asyncscheduledtask.py
index 5b54598,9e3106b..ccf3d4a
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/asyncscheduledtask.py
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/modules/util/asyncscheduledtask.py
@@@ -61,9 -68,11 +68,12 @@@ class ScheduledExecutor(Thread)
"""
while not self.terminated:
time.sleep(self.delay)
- task_thread = Thread(target=self.task.execute_task)
- task_thread.setName("WorkerThreadForTask%s" % self.task.__class__.__name__)
- task_thread.setDaemon(True)
- log.debug("Starting a worker thread for the Scheduled Executor for task %s" % self.task.__class__.__name__)
- task_thread.start()
+ if not self.terminated:
+ task_thread = Thread(target=self.task.execute_task)
++ task_thread.setName("WorkerThreadForTask%s" % self.task.__class__.__name__)
++ task_thread.setDaemon(True)
++ log.debug("Starting a worker thread for the Scheduled Executor for task %s" % self.task.__class__.__name__)
+ task_thread.start()
def terminate(self):
"""