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 2015/03/01 10:12:23 UTC
[1/2] stratos git commit: Changing kubernetes service id to
service- to avoid validation failures
Repository: stratos
Updated Branches:
refs/heads/master 42c0baea9 -> 716d5176a
Changing kubernetes service id to service-<seq-no> to avoid validation failures
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1bfdb7dd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1bfdb7dd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1bfdb7dd
Branch: refs/heads/master
Commit: 1bfdb7ddb144977762c22574556a2f2db29aa5d6
Parents: 42c0bae
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Mar 1 14:38:56 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Mar 1 14:38:56 2015 +0530
----------------------------------------------------------------------
.../context/CloudControllerContext.java | 9 +++++
.../iaases/kubernetes/KubernetesIaas.java | 40 +++++++++++---------
2 files changed, 31 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1bfdb7dd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index 8543810..ac3997d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -168,6 +168,7 @@ public class CloudControllerContext implements Serializable {
private transient AsyncDataPublisher dataPublisher;
private boolean coordinator;
+ private int kubernetesServiceSeqNo;
private CloudControllerContext() {
// Check clustering status
@@ -729,4 +730,12 @@ public class CloudControllerContext implements Serializable {
destinationList.add(item);
}
}
+
+ public int getKubernetesServiceSeqNo() {
+ return kubernetesServiceSeqNo;
+ }
+
+ public void setKubernetesServiceSeqNo(int kubernetesServiceSeqNo) {
+ this.kubernetesServiceSeqNo = kubernetesServiceSeqNo;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/1bfdb7dd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
index f675a21..07da283 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
@@ -207,7 +207,7 @@ public class KubernetesIaas extends Iaas {
kubernetesPortRange.getLower());
// Generate kubernetes service ports and update port mappings in cartridge
- updateKubernetesServicePorts(kubClusterContext, clusterContext.getClusterId(), cartridge);
+ generateKubernetesServicePorts(kubClusterContext, clusterContext.getClusterId(), cartridge);
// Create kubernetes services for port mappings
KubernetesApiClient kubernetesApi = kubClusterContext.getKubApi();
@@ -411,7 +411,8 @@ public class KubernetesIaas extends Iaas {
* @throws KubernetesClientException
*/
private void createKubernetesServices(KubernetesApiClient kubernetesApi, ClusterContext clusterContext,
- KubernetesCluster kubernetesCluster) throws KubernetesClientException {
+ KubernetesCluster kubernetesCluster)
+ throws KubernetesClientException {
String clusterId = clusterContext.getClusterId();
String cartridgeType = clusterContext.getCartridgeType();
@@ -445,7 +446,7 @@ public class KubernetesIaas extends Iaas {
log.debug(String.format("Minion public IPs: %s", minionPublicIPs));
}
- int i = kubernetesServices.size();
+ int kubernetesServiceSeqNo = CloudControllerContext.getInstance().getKubernetesServiceSeqNo();
for (PortMapping portMapping : cartridge.getPortMappings()) {
// Skip if already created
@@ -455,7 +456,7 @@ public class KubernetesIaas extends Iaas {
}
// Service id = cluster id + kubernetes service seq number of cluster
- String serviceId = KubernetesIaasUtil.fixSpecialCharacters(clusterId + "-" + (++i));
+ String serviceId = KubernetesIaasUtil.fixSpecialCharacters("service" + "-" + (++kubernetesServiceSeqNo));
String serviceLabel = KubernetesIaasUtil.fixSpecialCharacters(clusterId);
if (log.isInfoEnabled()) {
@@ -468,8 +469,15 @@ public class KubernetesIaas extends Iaas {
// Create kubernetes service for port mapping
int servicePort = portMapping.getKubernetesServicePort();
String containerPortName = KubernetesIaasUtil.preparePortNameFromPortMapping(portMapping);
- kubernetesApi.createService(serviceId, serviceLabel, servicePort, containerPortName,
- minionPublicIPs.toArray(new String[minionPublicIPs.size()]));
+
+ try {
+ kubernetesApi.createService(serviceId, serviceLabel, servicePort, containerPortName,
+ minionPublicIPs.toArray(new String[minionPublicIPs.size()]));
+ } finally {
+ // Persist kubernetes service sequence no
+ CloudControllerContext.getInstance().setKubernetesServiceSeqNo(kubernetesServiceSeqNo);
+ CloudControllerContext.getInstance().persist();
+ }
try {
Thread.sleep(1000);
@@ -508,26 +516,24 @@ public class KubernetesIaas extends Iaas {
return false;
}
- private void updateKubernetesServicePorts(KubernetesClusterContext kubernetesClusterContext, String clusterId,
- Cartridge cartridge) {
+ private void generateKubernetesServicePorts(KubernetesClusterContext kubernetesClusterContext, String clusterId,
+ Cartridge cartridge) {
if(cartridge != null) {
- boolean servicePortsUpdated = false;
StringBuilder portMappingStrBuilder = new StringBuilder();
for (PortMapping portMapping : cartridge.getPortMappings()) {
if(portMapping.getKubernetesServicePort() == 0) {
int nextServicePort = kubernetesClusterContext.getNextServicePort();
if (nextServicePort == -1) {
- throw new RuntimeException(String.format("Could not generate service port: [cluster-id] %s [port] %d",
- clusterId, portMapping.getPort()));
+ throw new RuntimeException(String.format("Could not generate service port: [cluster-id] %s " +
+ "[port] %d", clusterId, portMapping.getPort()));
}
portMapping.setKubernetesServicePort(nextServicePort);
- servicePortsUpdated = true;
portMapping.setKubernetesServicePortMapping(true);
+ // Add port mappings to payload
if(portMappingStrBuilder.toString().length() > 0) {
portMappingStrBuilder.append(":");
}
-
portMappingStrBuilder.append(String.format("PROTOCOL=%s|PORT=%d|PROXY_PORT=%d",
portMapping.getProtocol(), portMapping.getPort(), portMapping.getProxyPort()));
@@ -541,11 +547,9 @@ public class KubernetesIaas extends Iaas {
NameValuePair nameValuePair = new NameValuePair(PORT_MAPPINGS, portMappingStrBuilder.toString());
payload.add(nameValuePair);
- if(servicePortsUpdated) {
- // Persist service ports added to port mappings
- CloudControllerContext.getInstance().updateKubernetesClusterContext(kubernetesClusterContext);
- CloudControllerContext.getInstance().persist();
- }
+ // Persist service ports added to port mappings
+ CloudControllerContext.getInstance().updateKubernetesClusterContext(kubernetesClusterContext);
+ CloudControllerContext.getInstance().persist();
}
}
[2/2] stratos git commit: Updating load balancer jndi.properties file
Posted by im...@apache.org.
Updating load balancer jndi.properties file
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/716d5176
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/716d5176
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/716d5176
Branch: refs/heads/master
Commit: 716d5176a2a2ae3f592a611638f13039416f6d7a
Parents: 1bfdb7d
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Mar 1 14:42:04 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Mar 1 14:42:04 2015 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/conf/jndi.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/716d5176/products/load-balancer/modules/distribution/src/main/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/conf/jndi.properties b/products/load-balancer/modules/distribution/src/main/conf/jndi.properties
index ee38fb4..0d6663a 100644
--- a/products/load-balancer/modules/distribution/src/main/conf/jndi.properties
+++ b/products/load-balancer/modules/distribution/src/main/conf/jndi.properties
@@ -20,6 +20,6 @@
# Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
# file for updating other configurations.
#
-connectionfactoryName=topicConnectionfactory
-connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5677'
-java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
+connectionfactoryName=TopicConnectionFactory
+java.naming.provider.url=tcp://localhost:61616
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory