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 2015/12/10 10:40:49 UTC
[2/5] incubator-brooklyn git commit: comments about postgres url
comments about postgres 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/8efda301
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8efda301
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8efda301
Branch: refs/heads/master
Commit: 8efda301a937ea06d2b7e49b5efd4fa3112dc5b9
Parents: 1337aff
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Dec 10 09:34:06 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Dec 10 09:34:06 2015 +0000
----------------------------------------------------------------------
.../brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java | 5 +++++
.../entity/database/postgresql/PostgreSqlSshDriver.java | 1 +
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8efda301/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java
index b4d1501..0421a98 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeImpl.java
@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
public class PostgreSqlNodeImpl extends SoftwareProcessImpl implements PostgreSqlNode {
+ @SuppressWarnings("unused")
private static final Logger LOG = LoggerFactory.getLogger(PostgreSqlNodeImpl.class);
public Class<?> getDriverInterface() {
@@ -60,6 +61,10 @@ public class PostgreSqlNodeImpl extends SoftwareProcessImpl implements PostgreSq
protected void connectSensors() {
super.connectSensors();
connectServiceUpIsRunning();
+ // in jdbc url it is postgresql:// but elsewhere it is usually postgres://
+ // TODO add a public JDBC_URL ?
+ // include user:pass@url ? (for all datastore types, and if so,
+ // make sure ".with_credentials" or similar is in name so it is masked in ui)
sensors().set(DATASTORE_URL, String.format("postgresql://%s:%s/", getAttribute(HOSTNAME), getAttribute(POSTGRESQL_PORT)));
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8efda301/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
index 91c3e1e..059c348 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
@@ -151,6 +151,7 @@ public class PostgreSqlSshDriver extends AbstractSoftwareProcessSshDriver implem
.queue();
// check that the proposed install dir is one that user postgres can access
+ // TODO if command above fails then the following `getUnchecked` blocks forever
if (DynamicTasks.queue(SshEffectorTasks.ssh(sudoAsUser("postgres", "ls "+getInstallDir())).allowingNonZeroExitCode()
.summary("check postgres user can access install dir")).asTask().getUnchecked()!=0) {
log.info("Postgres install dir "+getInstallDir()+" for "+getEntity()+" is not accessible to user 'postgres'; " + "using "+altInstallDir+" instead");