fix to support non-default pregelix cc http ports
diff --git a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
index 7bd5fb0..a71ea3d 100644
--- a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
+++ b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
@@ -99,7 +99,7 @@
PregelixJob currentJob = jobs.get(0);
PregelixJob lastJob = currentJob;
addHadoopConfiguration(currentJob, ipAddress, port, true);
- ClientCounterContext counterContext = new ClientCounterContext(ipAddress, 16001,
+ ClientCounterContext counterContext = new ClientCounterContext(ipAddress, ClusterConfig.getCCHTTPort(),
Arrays.asList(ClusterConfig.getNCNames()));
JobGen jobGen = null;
diff --git a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/jobgen/clusterconfig/ClusterConfig.java b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/jobgen/clusterconfig/ClusterConfig.java
index 244d624..d1f8b65 100644
--- a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/jobgen/clusterconfig/ClusterConfig.java
+++ b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/jobgen/clusterconfig/ClusterConfig.java
@@ -57,6 +57,7 @@
private static Scheduler hdfsScheduler;
private static Set<String> blackListNodes = new HashSet<String>();
private static IHyracksClientConnection hcc;
+ private static final int DEFAULT_CC_HTTP_PORT = 16001;
/**
* let tests set config path to be whatever
@@ -126,6 +127,14 @@
return Integer.parseInt(clusterProperties.getProperty("FRAME_SIZE"));
}
+ public static int getCCHTTPort() {
+ try { // TODO should we really provide a default value?
+ return Integer.parseInt(clusterProperties.getProperty("CC_HTTPPORT"));
+ } catch (NumberFormatException e) {
+ return DEFAULT_CC_HTTP_PORT;
+ }
+ }
+
/**
* set location constraint
*