You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/12/11 16:49:42 UTC
[1/4] incubator-brooklyn git commit: Derive artefact and directory
names from download URL.
Repository: incubator-brooklyn
Updated Branches:
refs/heads/0.8.x a046f433b -> b3e523d2a
Derive artefact and directory names from download URL.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/87673df4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/87673df4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/87673df4
Branch: refs/heads/0.8.x
Commit: 87673df4939a9470820f1ae1f8ce072155e26b61
Parents: 09bfa07
Author: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Authored: Wed Dec 9 11:22:04 2015 +0000
Committer: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Committed: Fri Dec 11 13:06:52 2015 +0000
----------------------------------------------------------------------
.../brooklyn/entity/database/mysql/MySqlSshDriver.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/87673df4/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
index 313a583..1ce6ddd 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
@@ -107,14 +107,15 @@ public class MySqlSshDriver extends AbstractSoftwareProcessSshDriver implements
return "mymysql.cnf";
}
- public String getInstallFilename() {
- return String.format("mysql-%s-%s.tar.gz", getVersion(), getOsTag());
+ public String getDefaultUnpackedDirectoryName() {
+ return Strings.removeAllFromEnd(resolver.getFilename(), ".tar.gz");
}
@Override
public void preInstall() {
- resolver = Entities.newDownloader(this, ImmutableMap.of("filename", getInstallFilename()));
- setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("mysql-%s-%s", getVersion(), getOsTag()))));
+ resolver = Entities.newDownloader(this);
+ String unpackedDirectoryName = resolver.getUnpackedDirectoryName(getDefaultUnpackedDirectoryName());
+ setExpandedInstallDir(Os.mergePaths(getInstallDir(), unpackedDirectoryName));
}
@Override
[2/4] incubator-brooklyn git commit: Atomic sensor test-and-set.
Posted by al...@apache.org.
Atomic sensor test-and-set.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e78c9226
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e78c9226
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e78c9226
Branch: refs/heads/0.8.x
Commit: e78c9226f637398d84ba0b63c1170af8e2f57139
Parents: 87673df
Author: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Authored: Wed Dec 9 11:22:47 2015 +0000
Committer: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Committed: Fri Dec 11 13:06:53 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e78c9226/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
index 5346fcb..8b3b5d6 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
@@ -132,8 +132,8 @@ public class MySqlNodeImpl extends SoftwareProcessImpl implements MySqlNode {
public int getPort() {
return getAttribute(MYSQL_PORT);
}
-
- public String getSocketUid() {
+
+ public synchronized String getSocketUid() {
String result = getAttribute(MySqlNode.SOCKET_UID);
if (Strings.isBlank(result)) {
result = Identifiers.makeRandomId(6);
[4/4] incubator-brooklyn git commit: This closes #1102
Posted by al...@apache.org.
This closes #1102
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b3e523d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b3e523d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b3e523d2
Branch: refs/heads/0.8.x
Commit: b3e523d2ab8a74a9e80d4e87e1d009b5cc88c046
Parents: a046f43 482461d
Author: Aled Sage <al...@gmail.com>
Authored: Fri Dec 11 15:48:42 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Dec 11 15:48:42 2015 +0000
----------------------------------------------------------------------
.../brooklyn/entity/database/mysql/MySqlNode.java | 2 +-
.../brooklyn/entity/database/mysql/MySqlNodeImpl.java | 4 ++--
.../entity/database/mysql/MySqlSshDriver.java | 14 ++++++++++----
3 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-brooklyn git commit: Derive correct URL path for
specified version.
Posted by al...@apache.org.
Derive correct URL path for specified version.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/482461d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/482461d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/482461d6
Branch: refs/heads/0.8.x
Commit: 482461d61a40e101e8abc2b76a8e694bc1824b1a
Parents: e78c922
Author: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Authored: Wed Dec 9 12:57:11 2015 +0000
Committer: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Committed: Fri Dec 11 13:06:53 2015 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/database/mysql/MySqlNode.java | 2 +-
.../apache/brooklyn/entity/database/mysql/MySqlSshDriver.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/482461d6/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
index 484606e..3e5bb7e 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNode.java
@@ -50,7 +50,7 @@ public interface MySqlNode extends SoftwareProcess, HasShortName, DatastoreCommo
//http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.26-linux-glibc2.5-x86_64.tar.gz
@SetFromFlag("downloadUrl")
BasicAttributeSensorAndConfigKey<String> DOWNLOAD_URL = new StringAttributeSensorAndConfigKey(
- Attributes.DOWNLOAD_URL, "http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-${version}-${driver.osTag}.tar.gz");
+ Attributes.DOWNLOAD_URL, "http://dev.mysql.com/get/Downloads/MySQL-${driver.majorVersion}/mysql-${version}-${driver.osTag}.tar.gz");
@SetFromFlag("port")
PortAttributeSensorAndConfigKey MYSQL_PORT = new PortAttributeSensorAndConfigKey("mysql.port", "MySQL port", PortRanges.fromString("3306, 13306+"));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/482461d6/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
index 1ce6ddd..1e52585 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlSshDriver.java
@@ -107,6 +107,11 @@ public class MySqlSshDriver extends AbstractSoftwareProcessSshDriver implements
return "mymysql.cnf";
}
+ // Only invoked to determine the default download URL form the specified version.
+ public String getMajorVersion() {
+ return getEntity().config().get(MySqlNode.SUGGESTED_VERSION).replaceAll("(\\d+\\.\\d+)\\.\\d+", "$1");
+ }
+
public String getDefaultUnpackedDirectoryName() {
return Strings.removeAllFromEnd(resolver.getFilename(), ".tar.gz");
}