This closes #25
Conflicts:
software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
- connect enrichers was removed, fixed here
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4734ad89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4734ad89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4734ad89
Branch: refs/heads/master
Commit: 4734ad8932f59d228d347669e1ad8c560f06f0f3
Parents: c720e8c f23ee27
Author: Alex Heneveld <[email protected]>
Authored: Fri Aug 29 19:02:03 2014 -0400
Committer: Alex Heneveld <[email protected]>
Committed: Fri Aug 29 19:02:03 2014 -0400
----------------------------------------------------------------------
.../nosql/couchbase/CouchbaseCluster.java | 23 ++-
.../nosql/couchbase/CouchbaseClusterImpl.java | 108 +++++++++++-
.../entity/nosql/couchbase/CouchbaseNode.java | 6 +
.../nosql/couchbase/CouchbaseNodeDriver.java | 2 +
.../nosql/couchbase/CouchbaseNodeImpl.java | 4 +
.../nosql/couchbase/CouchbaseNodeSshDriver.java | 123 ++++++++++++-
.../nosql/couchbase/CouchbaseSyncGateway.java | 75 ++++++++
.../couchbase/CouchbaseSyncGatewayDriver.java | 27 +++
.../couchbase/CouchbaseSyncGatewayImpl.java | 82 +++++++++
.../CouchbaseSyncGatewaySshDriver.java | 176 +++++++++++++++++++
.../CouchbaseSyncGatewayEc2LiveTest.java | 137 +++++++++++++++
11 files changed, 753 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4734ad89/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
----------------------------------------------------------------------
diff --cc
software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
index b47f133,4affcd1..dc63e8c
---
a/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
+++
b/software/nosql/src/main/java/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
@@@ -42,6 -43,13 +45,11 @@@ import brooklyn.entity.group.DynamicClu
import brooklyn.entity.proxying.EntitySpec;
import brooklyn.entity.trait.Startable;
import brooklyn.event.AttributeSensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
+ import brooklyn.event.basic.DependentConfiguration;
+ import brooklyn.event.feed.http.HttpFeed;
+ import brooklyn.event.feed.http.HttpPollConfig;
+ import brooklyn.event.feed.http.HttpValueFunctions;
+ import brooklyn.event.feed.http.JsonFunctions;
import brooklyn.location.Location;
import brooklyn.policy.PolicySpec;
import brooklyn.util.collections.MutableSet;
@@@ -129,7 -147,10 +147,9 @@@ public class CouchbaseClusterImpl exten
super.start(locations);
connectSensors();
- connectEnrichers();
+ setAttribute(BUCKET_CREATION_IN_PROGRESS, false);
+
//start timeout before adding the servers
Time.sleep(getConfig(SERVICE_UP_TIME_OUT));
