You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/09/23 11:49:59 UTC
brooklyn-library git commit: fix for server#340, and notes
Repository: brooklyn-library
Updated Branches:
refs/heads/master 621bf5f9d -> b316f5375
fix for server#340, and notes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/b316f537
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/b316f537
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/b316f537
Branch: refs/heads/master
Commit: b316f5375c6497929acc5cb37d40f697a2cba27c
Parents: 621bf5f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Sep 23 12:48:52 2016 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 23 12:49:47 2016 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/database/mysql/MySqlCluster.java | 1 +
.../nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/b316f537/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java
index 67c1e80..6831aa8 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlCluster.java
@@ -38,6 +38,7 @@ import com.google.common.reflect.TypeToken;
@Catalog(name="MySql Master-Slave cluster", description="Sets up a cluster of MySQL nodes using master-slave relation and binary logging", iconUrl="classpath:///mysql-logo-110x57.png")
public interface MySqlCluster extends DynamicCluster, HasDatastoreUrl {
interface MySqlMaster {
+ // TODO these should be on MySqlCluster - no need to have on an interface
ConfigKey<String> MASTER_CREATION_SCRIPT_CONTENTS = ConfigKeys.newStringConfigKey(
"datastore.master.creation.script.contents", "Contents of creation script to initialize the master node after initializing replication");
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/b316f537/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java
index 05ab66c..056ca71 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java
@@ -96,7 +96,7 @@ public class MongoDBShardedDeploymentImpl extends AbstractEntity implements Mong
Entities.invokeEffectorList(this, clusters, Startable.START, ImmutableMap.of("locations", locations))
.get();
- if (getConfigRaw(MongoDBShardedDeployment.CO_LOCATED_ROUTER_GROUP, true).isPresent()) {
+ if (config().getRaw(MongoDBShardedDeployment.CO_LOCATED_ROUTER_GROUP).isPresent()) {
policies().add(PolicySpec.create(ColocatedRouterTrackingPolicy.class)
.displayName("Co-located router tracker")
.configure("group", getConfig(MongoDBShardedDeployment.CO_LOCATED_ROUTER_GROUP)));