You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/03/21 16:37:31 UTC
[1/2] git commit: Remove port checking after instance activation
Repository: incubator-stratos
Updated Branches:
refs/heads/master 027875f1d -> fd928f0cc
Remove port checking after instance activation
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/bc03cad8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bc03cad8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bc03cad8
Branch: refs/heads/master
Commit: bc03cad846fb25afb8e3d1f0ab12e28ea0adaa29
Parents: e2c5957
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Fri Mar 21 21:04:50 2014 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Fri Mar 21 21:04:50 2014 +0530
----------------------------------------------------------------------
.../publisher/HealthStatisticsNotifier.java | 14 --------------
1 file changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bc03cad8/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
index d8a04e7..4f1443b 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
@@ -55,20 +55,6 @@ public class HealthStatisticsNotifier implements Runnable {
}
if (statsPublisher.isEnabled()) {
- if(!CartridgeAgentUtils.checkPortsActive("localhost", CartridgeAgentConfiguration.getInstance().getPorts())
- && ( !CartridgeAgentEventPublisher.isMaintenance() || !CartridgeAgentEventPublisher.isReadyToShutdown() ) ) {
- if(log.isInfoEnabled()) {
- log.info("Publishing ports not open event");
- }
- statsPublisher.publish(
- CartridgeAgentConfiguration.getInstance().getClusterId(),
- CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
- CartridgeAgentConfiguration.getInstance().getMemberId(),
- CartridgeAgentConfiguration.getInstance().getPartitionId(),
- CartridgeAgentConstants.PORTS_NOT_OPEN,
- 1
- );
- }
double memoryConsumption = HealthStatisticsReader.getMemoryConsumption();
if(log.isInfoEnabled()) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ma...@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/fd928f0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fd928f0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fd928f0c
Branch: refs/heads/master
Commit: fd928f0ccc790b76a38f7315129a52cc903d5c14
Parents: bc03cad 027875f
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Fri Mar 21 21:07:04 2014 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Fri Mar 21 21:07:04 2014 +0530
----------------------------------------------------------------------
.../cartridge/agent/RepositoryFileListener.java | 8 +-
.../git/impl/GitBasedArtifactRepository.java | 90 +--
.../publisher/HealthStatisticsNotifier.java | 8 +-
.../agent/util/CartridgeAgentUtils.java | 17 +-
.../controller/iaases/OpenstackNovaIaas.java | 3 +-
.../impl/CloudControllerServiceImpl.java | 5 +-
.../balancer/cache/AlgorithmContextCache.java | 10 +-
.../console/themes/theme1/pages/index.hbs | 11 +-
.../console/themes/theme1/pages/plain.hbs | 2 +-
.../console/themes/theme1/partials/login.hbs | 4 +-
.../themes/theme1/ui/Open_Sans/LICENSE.txt | 202 +++++
.../theme1/ui/Open_Sans/OpenSans-Bold.ttf | Bin 0 -> 224592 bytes
.../theme1/ui/Open_Sans/OpenSans-BoldItalic.ttf | Bin 0 -> 213292 bytes
.../theme1/ui/Open_Sans/OpenSans-ExtraBold.ttf | Bin 0 -> 222584 bytes
.../ui/Open_Sans/OpenSans-ExtraBoldItalic.ttf | Bin 0 -> 213420 bytes
.../theme1/ui/Open_Sans/OpenSans-Italic.ttf | Bin 0 -> 212896 bytes
.../theme1/ui/Open_Sans/OpenSans-Light.ttf | Bin 0 -> 222412 bytes
.../ui/Open_Sans/OpenSans-LightItalic.ttf | Bin 0 -> 213128 bytes
.../theme1/ui/Open_Sans/OpenSans-Regular.ttf | Bin 0 -> 217360 bytes
.../theme1/ui/Open_Sans/OpenSans-Semibold.ttf | Bin 0 -> 221328 bytes
.../ui/Open_Sans/OpenSans-SemiboldItalic.ttf | Bin 0 -> 212820 bytes
.../themes/theme1/ui/Open_Sans/open_sans.css | 18 +
.../theme1/ui/custom-font-new/LICENSE.txt | 12 +
.../themes/theme1/ui/custom-font-new/README.txt | 75 ++
.../theme1/ui/custom-font-new/config.json | 740 +++++++++++++++++++
.../theme1/ui/custom-font-new/css/animation.css | 85 +++
.../ui/custom-font-new/css/fontello-codes.css | 112 +++
.../custom-font-new/css/fontello-embedded.css | 165 +++++
.../custom-font-new/css/fontello-ie7-codes.css | 112 +++
.../ui/custom-font-new/css/fontello-ie7.css | 123 +++
.../theme1/ui/custom-font-new/css/fontello.css | 163 ++++
.../themes/theme1/ui/custom-font-new/demo.html | 433 +++++++++++
.../theme1/ui/custom-font-new/font/fontello.eot | Bin 0 -> 30296 bytes
.../theme1/ui/custom-font-new/font/fontello.svg | 122 +++
.../theme1/ui/custom-font-new/font/fontello.ttf | Bin 0 -> 30128 bytes
.../ui/custom-font-new/font/fontello.woff | Bin 0 -> 22732 bytes
.../manager/CartridgeSubscriptionManager.java | 11 +-
.../modules/distribution/src/bin/stratos.sh | 1 +
38 files changed, 2424 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fd928f0c/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
index 4f1443b,e6c7e28..4bdad04
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
@@@ -55,10 -55,24 +55,10 @@@ public class HealthStatisticsNotifier i
}
if (statsPublisher.isEnabled()) {
- if(!CartridgeAgentUtils.checkPortsActive("localhost", CartridgeAgentConfiguration.getInstance().getPorts())
- && ( !CartridgeAgentEventPublisher.isMaintenance() || !CartridgeAgentEventPublisher.isReadyToShutdown() ) ) {
- if(log.isInfoEnabled()) {
- log.info("Publishing ports not open event");
- }
- statsPublisher.publish(
- CartridgeAgentConfiguration.getInstance().getClusterId(),
- CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
- CartridgeAgentConfiguration.getInstance().getMemberId(),
- CartridgeAgentConfiguration.getInstance().getPartitionId(),
- CartridgeAgentConstants.PORTS_NOT_OPEN,
- 1
- );
- }
double memoryConsumption = HealthStatisticsReader.getMemoryConsumption();
- if(log.isInfoEnabled()) {
- log.info(String.format("Publishing memory consumption: %f", memoryConsumption));
+ if(log.isDebugEnabled()) {
+ log.debug(String.format("Publishing memory consumption: %f", memoryConsumption));
}
statsPublisher.publish(
CartridgeAgentConfiguration.getInstance().getClusterId(),