You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/06/17 18:00:38 UTC
airavata git commit: Fixed AiravaraZKUtils compilation issues
Repository: airavata
Updated Branches:
refs/heads/master 5d10a05d9 -> ae41a3a4d
Fixed AiravaraZKUtils compilation issues
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ae41a3a4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ae41a3a4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ae41a3a4
Branch: refs/heads/master
Commit: ae41a3a4debcc5fa872098bb48add888e92a6f8d
Parents: 5d10a05
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Wed Jun 17 12:00:33 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Wed Jun 17 12:00:33 2015 -0400
----------------------------------------------------------------------
.../airavata/common/utils/AiravataZKUtils.java | 16 +++++-----------
.../airavata/common/utils/ServerSettings.java | 4 ++++
2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ae41a3a4/modules/commons/src/main/java/org/apache/airavata/common/utils/AiravataZKUtils.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/AiravataZKUtils.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/AiravataZKUtils.java
index f753bc1..5faf985 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/AiravataZKUtils.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/AiravataZKUtils.java
@@ -51,26 +51,20 @@ public class AiravataZKUtils implements Watcher {
}
public static String getExpZnodePath(String experimentId) throws ApplicationSettingsException {
- return ServerSettings.getSetting(Constants.ZOOKEEPER_GFAC_EXPERIMENT_NODE) +
- File.separator +
- ServerSettings.getSetting(Constants.ZOOKEEPER_GFAC_SERVER_NAME) + File.separator
- + experimentId;
+ return "/experiments" + File.separator + ServerSettings.getGFacServerName() + File.separator + experimentId;
}
public static String getExpZnodeHandlerPath(String experimentId, String className) throws ApplicationSettingsException {
- return ServerSettings.getSetting(Constants.ZOOKEEPER_GFAC_EXPERIMENT_NODE) +
- File.separator +
- ServerSettings.getSetting(Constants.ZOOKEEPER_GFAC_SERVER_NAME) + File.separator
- + experimentId + File.separator + className;
+ return "/experiments" + File.separator + ServerSettings.getGFacServerName() + File.separator + experimentId +
+ File.separator + className;
}
public static String getZKhostPort() throws ApplicationSettingsException {
- return ServerSettings.getSetting(Constants.ZOOKEEPER_SERVER_HOST,"localhost")
- + ":" + ServerSettings.getSetting(Constants.ZOOKEEPER_SERVER_PORT,"2181");
+ return ServerSettings.getZookeeperConnection();
}
public static int getZKTimeout()throws ApplicationSettingsException {
- return Integer.parseInt(ServerSettings.getSetting(Constants.ZOOKEEPER_TIMEOUT,"30000"));
+ return ServerSettings.getZookeeperTimeout();
}
public static String getExpStatePath(String experimentId) throws ApplicationSettingsException {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ae41a3a4/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
index 50a9fa9..4ed1e95 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
@@ -288,6 +288,10 @@ public class ServerSettings extends ApplicationSettings {
return getSetting(ZOOKEEPER_SERVER_CONNECTION, "localhost:2181");
}
+ public static int getZookeeperTimeout() {
+ return Integer.valueOf(getSetting(ZOOKEEPER_TIMEOUT, "3000"));
+ }
+
public static String getGFacServerName() throws ApplicationSettingsException {
return getSetting(GFAC_SERVER_NAME);
}