You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by aledsage <gi...@git.apache.org> on 2015/03/10 17:52:19 UTC
[GitHub] incubator-brooklyn pull request: Fix: various 20150310
GitHub user aledsage opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/547
Fix: various 20150310
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aledsage/incubator-brooklyn fix/various-20150310
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/547.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #547
----
commit d55f8ed6039f68af538740d52b370efb2e180e0e
Author: Aled Sage <al...@gmail.com>
Date: 2015-03-06T18:04:50Z
Add versions to downstream-parent’s pom
- Matching core brookyln’s versions, adds:
- jsr305 2.01
- snakeyaml 1.11
commit 4648531a342f8dde53359ea74bb486c46daaec29
Author: Aled Sage <al...@gmail.com>
Date: 2015-03-10T13:41:11Z
Avoid err if unmanage entity twice
- BrooklynNode unmanages itself on stop, and the BrooklynCluster
(extends DynamicCluster) also unmanaged its members when shrinking.
- This was causing an error in EntityManagementSupport.onManagementStopped
when checking if the value of mangaementContext was as expected.
commit fe5ecca123525b4d6c8cd9f5c0049e3d5b6b12b6
Author: Aled Sage <al...@gmail.com>
Date: 2015-03-10T13:46:05Z
BrooklynNode: only unmanage if VM terminating
commit f736dfc84f79d3aa6275747ad3bdf6e4d9181a0d
Author: Aled Sage <al...@gmail.com>
Date: 2015-03-10T13:46:54Z
Add SoftwareProcess.preRestart (for BrooklynNode)
- Fixes restarting of the software process of BrooklynNode
- Adds test for BrooklynNode restart
commit e87071138bc2714605cd8fc45b2002c45f046a45
Author: Aled Sage <al...@gmail.com>
Date: 2015-03-10T13:48:01Z
BrooklynCluster: add memberSpec + test
- Before memberSpec was added, it would fail if you asked for a
BrooklynCluster without supplying a memberSpec yourself.
commit 82c24fa497049affcc49a82b1236e108fefca096
Author: Aled Sage <al...@gmail.com>
Date: 2015-03-10T16:22:35Z
Couchbase: change default bucket-ramsize to 100
- with 200, tests that created a bucket were failing on softlayer.
Decreasing it to 100 (which is the minimum) let them pass
commit 0d9ce04c2e77dbb1930d7eacc68a88addd57b930
Author: Aled Sage <al...@gmail.com>
Date: 2015-03-10T16:23:14Z
Couchbase: fix upQuorumCheck config so serializable
commit a37542dbfdf4c6350330304c597f4d4315201858
Author: Aled Sage <al...@gmail.com>
Date: 2015-03-10T16:47:41Z
Couchbase: tests for example yaml blueprints
- Rename couchbase.yaml to couchbase-cluster.yaml
- Adds CouchbaseBlueprintTest.java
- Adds yaml/test for:
- couchbase-cluster-singleNode.yaml
- couchbase-node.yaml
- Updates couchbase yaml so all point at softlayer (except for
couchbase-replication-w-pillowfight.yaml which spans AWS and
softlayer)
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix: various 20150310
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/547
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix: various 20150310
Posted by alasdairhodge <gi...@git.apache.org>.
Github user alasdairhodge commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/547#issuecomment-78108610
Falls foul of the dreaded RAT: `BrooklynClusterIntegrationTest.java` is missing the Apache header comment.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix: various 20150310
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/547#issuecomment-78255873
Let's hold off merging until https://github.com/apache/incubator-brooklyn/pull/542 is done, and this PR is rebased - https://github.com/apache/incubator-brooklyn/pull/542 includes fixes for the BrooklynNode stuff done here (but not quite all of them).
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix: various 20150310
Posted by alasdairhodge <gi...@git.apache.org>.
Github user alasdairhodge commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/547#discussion_r26207604
--- Diff: core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java ---
@@ -315,6 +315,9 @@ public void onManagementStopping(ManagementTransitionInfo info) {
public void onManagementStopped(ManagementTransitionInfo info) {
synchronized (this) {
+ if (managementContext == null && nonDeploymentManagementContext.getMode() == NonDeploymentManagementContext.NonDeploymentManagementContextMode.MANAGEMENT_STOPPED) {
+ return;
+ }
--- End diff --
Worth a static import, of the inner class at least.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix: various 20150310
Posted by alasdairhodge <gi...@git.apache.org>.
Github user alasdairhodge commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/547#issuecomment-78255366
Looks good overall. Minor comments, but RAT failure is only show-stopper.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix: various 20150310
Posted by alasdairhodge <gi...@git.apache.org>.
Github user alasdairhodge commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/547#issuecomment-87240257
Looking good. Nice improvements.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix: various 20150310
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/547#issuecomment-86620734
@alasdairhodge can you take another look please - the changes relating to BrooklynNodeImpl were done in Svet's PR #542, so have been removed from here.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix: various 20150310
Posted by alasdairhodge <gi...@git.apache.org>.
Github user alasdairhodge commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/547#discussion_r26208100
--- Diff: software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java ---
@@ -192,7 +198,8 @@ protected void postStop() {
super.postStop();
ConfigBag stopParameters = BrooklynTaskTags.getCurrentEffectorParameters();
//unmanage only if stopping the machine
- if (stopParameters == null || stopParameters.get(StopSoftwareParameters.STOP_MACHINE)) {
+ if (stopParameters == null || (StopMode.NEVER != stopParameters.get(StopSoftwareParameters.STOP_MACHINE_MODE)
+ && Boolean.TRUE.equals(stopParameters.get(StopSoftwareParameters.STOP_MACHINE)))) {
--- End diff --
The combination of `STOP_MACHINE` and `STOP_MACHINE_MODE` is confusing! If this specific permutation gets checked in multiple places, it might be worth providing a convenience method.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---