From 28fc278ff4850c4125216d9aa3f8da6a2f91d5fa Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 28 Oct 2014 15:39:52 +0000 Subject: [PATCH 1/8] Bump MongoDB version to 2.6.5 --- .../entity/nosql/mongodb/AbstractMongoDBServer.java | 6 +++++- .../brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java index 2c48d69cd1..355b1734a9 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBServer.java @@ -29,6 +29,10 @@ public interface AbstractMongoDBServer extends SoftwareProcess, Entity { + // TODO Need to properly test v2.4.x and v2.5.x support. + // I think the v2.5.x were dev releases. + // Should update mongo.config to yaml format, but no rush for that. + @SetFromFlag("dataDirectory") ConfigKey DATA_DIRECTORY = ConfigKeys.newStringConfigKey( "mongodb.data.directory", "Data directory to store MongoDB journals"); @@ -40,7 +44,7 @@ public interface AbstractMongoDBServer extends SoftwareProcess, Entity { @SetFromFlag("version") ConfigKey SUGGESTED_VERSION = - ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "2.5.4"); + ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "2.6.5"); // TODO: Windows support // e.g. http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-2.2.2.tgz, diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java index d0bcc1f1fb..3a7aeb0beb 100644 --- a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java +++ b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java @@ -96,7 +96,14 @@ public static boolean isConfigServer(AbstractMongoDBServer entity) { Map parsedArgs = (Map)commandResult.get("parsed"); if (parsedArgs == null) return false; Boolean configServer = (Boolean)parsedArgs.get("configsvr"); - return (configServer != null && configServer.equals(true)); + if (configServer != null) { + // v2.5 format + return Boolean.TRUE.equals(configServer); + } else { + // v2.6 format + String role = (String) ((Map)parsedArgs.get("sharding")).get("clusterRole"); + return "configsvr".equals(role); + } } finally { mongoClient.close(); } From 7157b6d3d2d8ce0720a45d16ddb0e30052c0b2dc Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 28 Oct 2014 15:40:17 +0000 Subject: [PATCH 2/8] Avoid NPE in MongoDBShardClusterImpl --- .../mongodb/sharding/MongoDBShardClusterImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardClusterImpl.java b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardClusterImpl.java index 1d68728bbe..5b465caed5 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardClusterImpl.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardClusterImpl.java @@ -89,11 +89,15 @@ protected void addShards() { for (Entity member : this.getMembers()) { if (member.getAttribute(Startable.SERVICE_UP) && !addedMembers.contains(member)) { MongoDBServer primary = member.getAttribute(MongoDBReplicaSet.PRIMARY_ENTITY); - String addr = Strings.removeFromStart(primary.getAttribute(MongoDBServer.MONGO_SERVER_ENDPOINT), "http://"); - String replicaSetURL = ((MongoDBReplicaSet) member).getName() + "/" + addr; - LOG.info("Using {} to add shard URL {}...", router, replicaSetURL); - client.addShardToRouter(replicaSetURL); - addedMembers.add(member); + if (primary != null) { + String addr = Strings.removeFromStart(primary.getAttribute(MongoDBServer.MONGO_SERVER_ENDPOINT), "http://"); + String replicaSetURL = ((MongoDBReplicaSet) member).getName() + "/" + addr; + LOG.info("Using {} to add shard URL {}...", router, replicaSetURL); + client.addShardToRouter(replicaSetURL); + addedMembers.add(member); + } else { + LOG.debug("{} not set for member {}); not adding shart to router {}", new Object[] {MongoDBReplicaSet.PRIMARY_ENTITY, member, router}); + } } } } From 4e07e491e54b0e36a9d11f1ac3847c4dc5934307 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 28 Oct 2014 15:42:44 +0000 Subject: [PATCH 3/8] MongoDBShardedDeployment: support spec for each type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Config keys for setting member spec of each type of cluster: for the routers, the Replica Set and the config servers. Important for if want to give different config files to each. - Supply test-config for integration test, so doesn’t create massive files. --- software/nosql/pom.xml | 3 +++ .../sharding/MongoDBShardedDeployment.java | 25 +++++++++++++++++ .../MongoDBShardedDeploymentImpl.java | 3 +++ .../MongoDBShardedDeploymentEc2LiveTest.java | 12 +++++++-- ...ngoDBShardedDeploymentIntegrationTest.java | 27 +++++++++---------- .../resources/test-mongodb-configserver.conf | 6 +++++ .../test/resources/test-mongodb-router.conf | 6 +++++ 7 files changed, 66 insertions(+), 16 deletions(-) create mode 100644 software/nosql/src/test/resources/test-mongodb-configserver.conf create mode 100644 software/nosql/src/test/resources/test-mongodb-router.conf diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml index 0e4b41edd7..0b384a7d6d 100644 --- a/software/nosql/pom.xml +++ b/software/nosql/pom.xml @@ -224,6 +224,9 @@ src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini src/main/resources/brooklyn/entity/nosql/couchdb/couch.uri src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf + src/test/resources/test-mongodb.conf + src/test/resources/test-mongodb-configserver.conf + src/test/resources/test-mongodb-router.conf src/main/resources/brooklyn/entity/nosql/redis/redis.conf src/main/resources/brooklyn/entity/nosql/redis/slave.conf src/main/resources/brooklyn/entity/nosql/riak/app.config diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeployment.java b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeployment.java index ffda9b188c..611eea5cfe 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeployment.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeployment.java @@ -23,6 +23,8 @@ import brooklyn.entity.Entity; import brooklyn.entity.Group; import brooklyn.entity.basic.ConfigKeys; +import brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; +import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.proxying.ImplementedBy; import brooklyn.entity.trait.Startable; import brooklyn.event.AttributeSensor; @@ -30,6 +32,8 @@ import brooklyn.util.flags.SetFromFlag; import brooklyn.util.time.Duration; +import com.google.common.reflect.TypeToken; + @Catalog(name="MongoDB Sharded Deployment", description="MongoDB (from \"humongous\") is a scalable, high-performance, open source NoSQL database", iconUrl="classpath:///mongodb-logo.png") @@ -59,6 +63,27 @@ public interface MongoDBShardedDeployment extends Entity, Startable { ConfigKey CO_LOCATED_ROUTER_GROUP = ConfigKeys.newConfigKey(Group.class, "mongodb.colocated.router.group", "Group to be monitored for the addition of new CoLocatedMongoDBRouter entities"); + @SuppressWarnings("serial") + ConfigKey> MONGODB_ROUTER_SPEC = ConfigKeys.newConfigKey( + new TypeToken>() {}, + "mongodb.router.spec", + "Spec for Router instances", + EntitySpec.create(MongoDBRouter.class)); + + @SuppressWarnings("serial") + ConfigKey> MONGODB_REPLICA_SET_SPEC = ConfigKeys.newConfigKey( + new TypeToken>() {}, + "mongodb.replicaset.spec", + "Spec for Replica Set", + EntitySpec.create(MongoDBReplicaSet.class)); + + @SuppressWarnings("serial") + ConfigKey> MONGODB_CONFIG_SERVER_SPEC = ConfigKeys.newConfigKey( + new TypeToken>() {}, + "mongodb.configserver.spec", + "Spec for Config Server instances", + EntitySpec.create(MongoDBConfigServer.class)); + public static AttributeSensor CONFIG_SERVER_CLUSTER = Sensors.newSensor( MongoDBConfigServerCluster.class, "mongodbshardeddeployment.configservers", "Config servers"); public static AttributeSensor ROUTER_CLUSTER = Sensors.newSensor( diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java index 9c9cd627e6..d4d04de590 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentImpl.java @@ -56,11 +56,14 @@ public void init() { super.init(); setAttribute(CONFIG_SERVER_CLUSTER, addChild(EntitySpec.create(MongoDBConfigServerCluster.class) + .configure(MongoDBConfigServerCluster.MEMBER_SPEC, getConfig(MONGODB_CONFIG_SERVER_SPEC)) .configure(DynamicCluster.INITIAL_SIZE, getConfig(CONFIG_CLUSTER_SIZE)))); setAttribute(ROUTER_CLUSTER, addChild(EntitySpec.create(MongoDBRouterCluster.class) + .configure(MongoDBRouterCluster.MEMBER_SPEC, getConfig(MONGODB_ROUTER_SPEC)) .configure(DynamicCluster.INITIAL_SIZE, getConfig(INITIAL_ROUTER_CLUSTER_SIZE)) .configure(MongoDBRouter.CONFIG_SERVERS, attributeWhenReady(getAttribute(CONFIG_SERVER_CLUSTER), MongoDBConfigServerCluster.CONFIG_SERVER_ADDRESSES)))); setAttribute(SHARD_CLUSTER, addChild(EntitySpec.create(MongoDBShardCluster.class) + .configure(MongoDBShardCluster.MEMBER_SPEC, getConfig(MONGODB_REPLICA_SET_SPEC)) .configure(DynamicCluster.INITIAL_SIZE, getConfig(INITIAL_SHARD_CLUSTER_SIZE)))); addEnricher(Enrichers.builder() .propagating(MongoDBConfigServerCluster.CONFIG_SERVER_ADDRESSES) diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentEc2LiveTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentEc2LiveTest.java index b8e4b13c01..e85a3ef824 100644 --- a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentEc2LiveTest.java +++ b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentEc2LiveTest.java @@ -27,6 +27,7 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.Entities; import brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; +import brooklyn.entity.nosql.mongodb.MongoDBServer; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.test.Asserts; @@ -54,8 +55,15 @@ public class MongoDBShardedDeploymentEc2LiveTest extends AbstractEc2LiveTest { protected void doTest(Location loc) throws Exception { final MongoDBShardedDeployment deployment = app.createAndManageChild(EntitySpec.create(MongoDBShardedDeployment.class) .configure(MongoDBShardedDeployment.INITIAL_ROUTER_CLUSTER_SIZE, ROUTER_CLUSTER_SIZE) - .configure(MongoDBShardedDeployment.SHARD_REPLICASET_SIZE,REPLICASET_SIZE) - .configure(MongoDBShardedDeployment.INITIAL_SHARD_CLUSTER_SIZE, SHARD_CLUSTER_SIZE)); + .configure(MongoDBShardedDeployment.SHARD_REPLICASET_SIZE, REPLICASET_SIZE) + .configure(MongoDBShardedDeployment.INITIAL_SHARD_CLUSTER_SIZE, SHARD_CLUSTER_SIZE) + .configure(MongoDBShardedDeployment.MONGODB_REPLICA_SET_SPEC, EntitySpec.create(MongoDBReplicaSet.class) + .configure(MongoDBServer.MONGODB_CONF_TEMPLATE_URL, "classpath:///test-mongodb.conf") + .configure(MongoDBReplicaSet.MEMBER_SPEC, EntitySpec.create(MongoDBServer.class))) + .configure(MongoDBShardedDeployment.MONGODB_ROUTER_SPEC, EntitySpec.create(MongoDBRouter.class) + .configure(MongoDBConfigServer.MONGODB_CONF_TEMPLATE_URL, "classpath:///test-mongodb-router.conf")) + .configure(MongoDBShardedDeployment.MONGODB_CONFIG_SERVER_SPEC, EntitySpec.create(MongoDBConfigServer.class) + .configure(MongoDBConfigServer.MONGODB_CONF_TEMPLATE_URL, "classpath:///test-mongodb-configserver.conf"))); app.start(ImmutableList.of(loc)); diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentIntegrationTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentIntegrationTest.java index 6ef29e53c7..bfa00e8382 100644 --- a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentIntegrationTest.java +++ b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentIntegrationTest.java @@ -19,51 +19,50 @@ package brooklyn.entity.nosql.mongodb.sharding; import org.testng.Assert; -import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import brooklyn.entity.BrooklynAppLiveTestSupport; import brooklyn.entity.Entity; -import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.entity.basic.Entities; import brooklyn.entity.nosql.mongodb.AbstractMongoDBServer; import brooklyn.entity.nosql.mongodb.MongoDBReplicaSet; +import brooklyn.entity.nosql.mongodb.MongoDBServer; import brooklyn.entity.nosql.mongodb.MongoDBTestHelper; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.EntityTestUtils; -import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.mongodb.DBObject; -public class MongoDBShardedDeploymentIntegrationTest { +public class MongoDBShardedDeploymentIntegrationTest extends BrooklynAppLiveTestSupport { private static final Integer ROUTER_CLUSTER_SIZE = 2; private static final Integer REPLICASET_SIZE = 2; private static final Integer SHARD_CLUSTER_SIZE = 3; - private TestApplication app; private LocalhostMachineProvisioningLocation localhostProvisioningLocation; @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { - localhostProvisioningLocation = new LocalhostMachineProvisioningLocation(); - app = ApplicationBuilder.newManagedApp(TestApplication.class); + super.setUp(); + localhostProvisioningLocation = app.newLocalhostProvisioningLocation(); } - @AfterMethod(alwaysRun=true) - public void tearDown() throws Exception { - if (app != null) Entities.destroyAll(app.getManagementContext()); - } - private MongoDBShardedDeployment makeAndStartDeployment() { final MongoDBShardedDeployment deployment = app.createAndManageChild(EntitySpec.create(MongoDBShardedDeployment.class) .configure(MongoDBShardedDeployment.INITIAL_ROUTER_CLUSTER_SIZE, ROUTER_CLUSTER_SIZE) .configure(MongoDBShardedDeployment.SHARD_REPLICASET_SIZE, REPLICASET_SIZE) - .configure(MongoDBShardedDeployment.INITIAL_SHARD_CLUSTER_SIZE, SHARD_CLUSTER_SIZE)); + .configure(MongoDBShardedDeployment.INITIAL_SHARD_CLUSTER_SIZE, SHARD_CLUSTER_SIZE) + .configure(MongoDBShardedDeployment.MONGODB_REPLICA_SET_SPEC, EntitySpec.create(MongoDBReplicaSet.class) + .configure(MongoDBServer.MONGODB_CONF_TEMPLATE_URL, "classpath:///test-mongodb.conf") + .configure(MongoDBReplicaSet.MEMBER_SPEC, EntitySpec.create(MongoDBServer.class))) + .configure(MongoDBShardedDeployment.MONGODB_ROUTER_SPEC, EntitySpec.create(MongoDBRouter.class) + .configure(MongoDBConfigServer.MONGODB_CONF_TEMPLATE_URL, "classpath:///test-mongodb-router.conf")) + .configure(MongoDBShardedDeployment.MONGODB_CONFIG_SERVER_SPEC, EntitySpec.create(MongoDBConfigServer.class) + .configure(MongoDBConfigServer.MONGODB_CONF_TEMPLATE_URL, "classpath:///test-mongodb-configserver.conf"))); app.start(ImmutableList.of(localhostProvisioningLocation)); EntityTestUtils.assertAttributeEqualsEventually(deployment, Startable.SERVICE_UP, true); return deployment; diff --git a/software/nosql/src/test/resources/test-mongodb-configserver.conf b/software/nosql/src/test/resources/test-mongodb-configserver.conf new file mode 100644 index 0000000000..b5ec6cd692 --- /dev/null +++ b/software/nosql/src/test/resources/test-mongodb-configserver.conf @@ -0,0 +1,6 @@ +# MongoDB configuration file +# See http://docs.mongodb.org/manual/reference/configuration-options/ + +# Makes servers extra verbose +verbose = v +vvvvv = true diff --git a/software/nosql/src/test/resources/test-mongodb-router.conf b/software/nosql/src/test/resources/test-mongodb-router.conf new file mode 100644 index 0000000000..b5ec6cd692 --- /dev/null +++ b/software/nosql/src/test/resources/test-mongodb-router.conf @@ -0,0 +1,6 @@ +# MongoDB configuration file +# See http://docs.mongodb.org/manual/reference/configuration-options/ + +# Makes servers extra verbose +verbose = v +vvvvv = true From 2cd43a060fa6db92c4cae8b0506a14dfc5a083e0 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 28 Oct 2014 15:43:30 +0000 Subject: [PATCH 4/8] Default mongo.conf: quiet=false for production --- .../brooklyn/entity/nosql/mongodb/default-mongodb.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf b/software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf index 6335f0d048..e45a74dbc3 100644 --- a/software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf +++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf @@ -3,8 +3,8 @@ # MongoDB configuration file # Startup configuration -quiet = true +quiet = false # Master/Slave configuration #master = true -#slave = false \ No newline at end of file +#slave = false From 9aeab837cab9bbe5cd4d0900b198ad16d3cc205d Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 28 Oct 2014 15:44:33 +0000 Subject: [PATCH 5/8] Fix MongoDBConfigServerIntegrationTest - use test-mongodb-configserver.conf, rather than that for the members of the replica set. --- .../mongodb/sharding/MongoDBConfigServerIntegrationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerIntegrationTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerIntegrationTest.java index af86093995..4aa8f69117 100644 --- a/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerIntegrationTest.java +++ b/software/nosql/src/test/java/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerIntegrationTest.java @@ -26,6 +26,7 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; +import brooklyn.entity.nosql.mongodb.MongoDBServer; import brooklyn.entity.nosql.mongodb.MongoDBTestHelper; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; @@ -54,7 +55,7 @@ public void tearDown() throws Exception { @Test(groups = "Integration") public void testCanStartAndStop() throws Exception { MongoDBConfigServer entity = app.createAndManageChild(EntitySpec.create(MongoDBConfigServer.class) - .configure("mongodbConfTemplateUrl", "classpath:///test-mongodb.conf")); + .configure(MongoDBServer.MONGODB_CONF_TEMPLATE_URL, "classpath:///test-mongodb-configserver.conf")); app.start(ImmutableList.of(localhostProvisioningLocation)); EntityTestUtils.assertAttributeEqualsEventually(entity, Startable.SERVICE_UP, true); From a951e39803625723d00abed2164b8790eba09022 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 28 Oct 2014 15:44:52 +0000 Subject: [PATCH 6/8] test-mongodb: decrease disk usage with noprealloc --- .../src/test/resources/test-mongodb.conf | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/software/nosql/src/test/resources/test-mongodb.conf b/software/nosql/src/test/resources/test-mongodb.conf index ed4234e38e..5214566dac 100644 --- a/software/nosql/src/test/resources/test-mongodb.conf +++ b/software/nosql/src/test/resources/test-mongodb.conf @@ -1,23 +1,3 @@ -[#ftl] -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - # MongoDB configuration file # See http://docs.mongodb.org/manual/reference/configuration-options/ @@ -25,10 +5,13 @@ verbose = v vvvvv = true -# Use less disk space for tests. smallfiles reduces the initial size of data -# files. oplogSize is the maximum size in megabytes for the replication operation -# log (and defaults to 5% of available disk space). +# Use less disk space for tests: +# - smallfiles reduces the initial size of data files. +# - noprealloc means don't create sparse files on startup +# - oplogSize is the maximum size in megabytes for the replication operation log +# (and defaults to 5% of available disk space). smallfiles = true +noprealloc = true oplogSize = 32 # Explicitly disable journalling on both 32 and 64 bit systems. By default: From 53cc5af3de05a9c6fcb39d8494684a2eecbd2186 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 28 Oct 2014 15:45:07 +0000 Subject: [PATCH 7/8] MongoDBServer: white space tidy --- .../main/java/brooklyn/entity/nosql/mongodb/MongoDBServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/MongoDBServer.java b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/MongoDBServer.java index c76fef19f6..5f216ab734 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/MongoDBServer.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/MongoDBServer.java @@ -99,7 +99,7 @@ public interface MongoDBServer extends AbstractMongoDBServer { "mongodb.server.replicaSet.primary.endpoint", "The host:port of the server which is acting as primary (master) for the replica set"); AttributeSensor MONGO_SERVER_ENDPOINT = Sensors.newStringSensor( - "mongodb.server.endpoint", "The host:port where this server is listening"); + "mongodb.server.endpoint", "The host:port where this server is listening"); /** * @return The replica set the server belongs to, or null if the server is a standalone instance. From 13f015a43daf0af71ebe6c12c0f2552f50eb42b7 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Tue, 28 Oct 2014 16:45:01 +0000 Subject: [PATCH 8/8] Bump cassandra v2 test version to 2.0.11 - and uploaded 2.0.11 artifact to developer.cloudsoftcorp.com --- .../entity/nosql/cassandra/CassandraNodeIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraNodeIntegrationTest.java b/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraNodeIntegrationTest.java index 6810e84f0a..9c3989c1c9 100644 --- a/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraNodeIntegrationTest.java +++ b/software/nosql/src/test/java/brooklyn/entity/nosql/cassandra/CassandraNodeIntegrationTest.java @@ -83,7 +83,7 @@ public void testConnection() throws Exception { */ @Test(groups = "Integration") public void testCassandraVersion2() throws Exception { - String version = "2.0.9"; + String version = "2.0.11"; String majorMinorVersion = "2.0"; cassandra = app.createAndManageChild(EntitySpec.create(CassandraNode.class)