You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/12/06 08:53:13 UTC
[1/3] stratos git commit: Revert "Update the AS registry manager"
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x a6665bb90 -> 2a425fdf4
Revert "Update the AS registry manager"
This reverts commit e64081f7944dadced190054eb44f8d1dafe0f892.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2a425fdf
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2a425fdf
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2a425fdf
Branch: refs/heads/stratos-4.1.x
Commit: 2a425fdf42108b9bf6218c9bc71eaae42595f6b6
Parents: 7a5e555
Author: gayangunarathne <ga...@wso2.com>
Authored: Sun Dec 6 13:21:47 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Sun Dec 6 13:22:38 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/registry/RegistryManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2a425fdf/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 343b76a..925c4ff 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
@@ -85,7 +85,7 @@ public class RegistryManager {
return instance;
}
- private synchronized Object retrieve(String resourcePath) {
+ private Object retrieve(String resourcePath) {
try {
Resource resource = registryService.get(resourcePath);
return resource.getContent();
@@ -99,7 +99,7 @@ public class RegistryManager {
}
}
- private synchronized void delete(String resourcePath) {
+ private void delete(String resourcePath) {
try {
registryService.beginTransaction();
registryService.delete(resourcePath);
@@ -138,7 +138,7 @@ public class RegistryManager {
* @param dataObj object to be persisted.
* @param resourcePath resource path to be persisted.
*/
- private synchronized void persist(Object dataObj, String resourcePath) throws AutoScalerException {
+ private void persist(Object dataObj, String resourcePath) throws AutoScalerException {
try {
registryService.beginTransaction();
[2/3] stratos git commit: UPdate the readme file with currect links
Posted by ga...@apache.org.
UPdate the readme file with currect links
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7a5e5558
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7a5e5558
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7a5e5558
Branch: refs/heads/stratos-4.1.x
Commit: 7a5e55583d181d329eb5f9bb5b4caa8b45dcc387
Parents: fcaaa1b
Author: gayangunarathne <ga...@wso2.com>
Authored: Sun Dec 6 13:20:05 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Sun Dec 6 13:22:38 2015 +0530
----------------------------------------------------------------------
README.md | 22 +++++++++++-----------
tools/stratos-installer/README.md | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7a5e5558/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d6c6f93..a98eaa6 100644
--- a/README.md
+++ b/README.md
@@ -46,14 +46,14 @@ auto-scaling policies with multiple factors,i.e., requests in flight, memory con
considered when scaling up or down. The Auto-scaler also supports scaling for non-HTTP transport.
<br />
For detailed information on how multi-factored auto-scaling takes place in Stratos,
-see [Autoscaler](https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Autoscaler).
+see [Autoscaler](https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Autoscaler).
* Smart policies <br />
The Auto-scaler in Stratos uses two smart policies when making auto-scaling decisions: auto-scaling policy and deployment policy.
The instances will be automatically spawned based on the smart policies that are applied to the application.
<br />
For more information on auto-scaling and deployment policy scaling policies, see [Smart Policies]
-(https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Smart+Policies).
+(https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Smart+Policies).
* Multiple IaaS support <br />
Apache Stratos is tested on the following IaaS providers: AWS EC2 and OpenStack. However, it is very easy to extend
@@ -68,7 +68,7 @@ be off-loaded to another cloud.
It is possible for DevOps to define partitions in a network partition, to control IaaS resources. Thereby,
Apache Stratos can control resources per cloud, region, and zone. Controlling of IaaS resources provide a high
availability and solves disaster recovery concerns. For more information, see [Cloud Partitioning]
-(https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Cloud+Partitioning).
+(https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Cloud+Partitioning).
* Loosely coupled communication <br />
Stratos uses the Advanced Message Queuing Protocol (AMQP) messaging technology for communication among all its components.
@@ -87,7 +87,7 @@ A cartridge is a package of code that includes a Virtual Machine (VM) image plus
be plugged into Stratos to offer a new PaaS service. Stratos supports single tenant and multi-tenant cartridges.
If needed, tenants can easily add their own cartridges to Stratos.
<br />
-For more information on how Stratos uses cartridges, see [Cartridge](https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Cartridge).
+For more information on how Stratos uses cartridges, see [Cartridge](https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Cartridge).
* Cartridge automation using Puppet <br />
Cartridges can be easily configured with the use of an orchestration layer such as Puppet.
@@ -96,7 +96,7 @@ Cartridges can be easily configured with the use of an orchestration layer such
Stratos supports third-party load balancers (LBs), i.e, HAProxy, NGINX. Thereby, if required, users can use their own
LB with Stratos.
<br />
-For more information, see [Load Balancers](https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Load+Balancers).
+For more information, see [Load Balancers](https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Load+Balancers).
* Artifact distribution coordination <br />
The Artifact Distribution Coordinator is responsible for the distribution of artifacts. Artifacts can be uploaded
@@ -106,25 +106,25 @@ repositories based deployment synchronization. Users are able to use their own G
a service instance.
<br />
For more information, see [Artifact Distribution Coordinator]
-(https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Artifact+Distribution+Coordinator).
+(https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Artifact+Distribution+Coordinator).
* Stratos Manager Console <br />
Administrators and tenants can use the Stratos Manager console, which is a web-based UI management console in Stratos,
to interact with Stratos.
<br />
-For more information, see [Stratos Manager](https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Stratos+Manager).
+For more information, see [Stratos Manager](https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Stratos+Manager).
* Stratos REST API <br />
DevOps can use REST APIs to carry out various administering functions (e.g., adding a tenant, adding a cartridge, etc.).
<br />
For more information, see the [Stratos API Reference Guide]
-(https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Stratos+API+Reference).
+(https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Stratos+API+Reference).
* Interactive CLI Tool <br />
Command Line Interface (CLI) tool provides users an interface to interact with Stratos and manage your applications.
<br />
-For more information, see the [CLI Tool](https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+CLI+Tool) and the
-[CLI Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+CLI+Guide).
+For more information, see the [CLI Tool](https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+CLI+Tool) and the
+[CLI Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+CLI+Guide).
* Monitoring and metering <br />
Apache Stratos provides centralized monitoring and metering. The level of resource utilization in Stratos is measured using metering.
@@ -134,7 +134,7 @@ If required, the DevOps can enable a persistent volume for cartridges. If persis
automatically attaches a volume when a new cartridge instance is created.
<br />
For more information, see [Persistence Volume Mapping]
-(https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Persistence+Volume+Mapping).
+(https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Persistence+Volume+Mapping).
* Gracefully shutdown instances <br />
Before terminating an instance, when scaling down, the Auto-scaler will allow all the existing requests to the instance
http://git-wip-us.apache.org/repos/asf/stratos/blob/7a5e5558/tools/stratos-installer/README.md
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/README.md b/tools/stratos-installer/README.md
index 38fb229..d1392ea 100644
--- a/tools/stratos-installer/README.md
+++ b/tools/stratos-installer/README.md
@@ -5,4 +5,4 @@ Apache Stratos Installer
Stratos-Installer is a tool to install Stratos in Single JVM as well as in distributed setup.
Please refer the following Stratos Wiki page for detailed installation guide:
-https://cwiki.apache.org/confluence/display/STRATOS/4.1.5+Installation+Guide
+https://cwiki.apache.org/confluence/display/STRATOS/4.1.x+Installation+Guide
[3/3] stratos git commit: Update the AS registry manager
Posted by ga...@apache.org.
Update the AS registry manager
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fcaaa1be
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fcaaa1be
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fcaaa1be
Branch: refs/heads/stratos-4.1.x
Commit: fcaaa1bed6107d95a31d3d125a748eb1fa28b1bb
Parents: a6665bb
Author: gayangunarathne <ga...@wso2.com>
Authored: Sun Dec 6 10:30:37 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Sun Dec 6 13:22:38 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/registry/RegistryManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fcaaa1be/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 925c4ff..343b76a 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
@@ -85,7 +85,7 @@ public class RegistryManager {
return instance;
}
- private Object retrieve(String resourcePath) {
+ private synchronized Object retrieve(String resourcePath) {
try {
Resource resource = registryService.get(resourcePath);
return resource.getContent();
@@ -99,7 +99,7 @@ public class RegistryManager {
}
}
- private void delete(String resourcePath) {
+ private synchronized void delete(String resourcePath) {
try {
registryService.beginTransaction();
registryService.delete(resourcePath);
@@ -138,7 +138,7 @@ public class RegistryManager {
* @param dataObj object to be persisted.
* @param resourcePath resource path to be persisted.
*/
- private void persist(Object dataObj, String resourcePath) throws AutoScalerException {
+ private synchronized void persist(Object dataObj, String resourcePath) throws AutoScalerException {
try {
registryService.beginTransaction();