| commit | f2782a85e50f4e31c2047a0f301de2300bf4b575 | [log] [tgz] |
|---|---|---|
| author | buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> | Sat Mar 23 10:57:43 2013 +0000 |
| committer | buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> | Sat Mar 23 10:57:43 2013 +0000 |
| tree | f971dcd79474b68d5dcd1084f1bc8edc6590c0db | |
| parent | bb8f92645c8b268e2b83941aeb3e2028273e1380 [diff] |
fix code and scripts for rack-awareness git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_release_candidate@3181 123451ca-8445-de46-9d55-352943316053
diff --git a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/dataload/DataLoadTest.java b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/dataload/DataLoadTest.java index 37f03a5..321b5b2 100644 --- a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/dataload/DataLoadTest.java +++ b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/dataload/DataLoadTest.java
@@ -76,7 +76,7 @@ ClusterConfig.setStorePath(PATH_TO_CLUSTER_STORE); ClusterConfig.setClusterPropertiesPath(PATH_TO_CLUSTER_PROPERTIES); cleanupStores(); - PregelixHyracksIntegrationUtil.init(); + PregelixHyracksIntegrationUtil.init("src/test/resources/topology.xml"); PregelixHyracksIntegrationUtil.createApp(HYRACKS_APP_NAME); LOGGER.info("Hyracks mini-cluster started"); startHDFS();
diff --git a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java index 79a5c3c..fa98ebd 100644 --- a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java +++ b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java
@@ -75,7 +75,7 @@ ClusterConfig.setStorePath(PATH_TO_CLUSTER_STORE); ClusterConfig.setClusterPropertiesPath(PATH_TO_CLUSTER_PROPERTIES); cleanupStores(); - PregelixHyracksIntegrationUtil.init(); + PregelixHyracksIntegrationUtil.init("src/test/resources/topology.xml"); PregelixHyracksIntegrationUtil.createApp(HYRACKS_APP_NAME); LOGGER.info("Hyracks mini-cluster started"); FileUtils.forceMkdir(new File(ACTUAL_RESULT_DIR));
diff --git a/pregelix/pregelix-example/src/test/resources/topology.xml b/pregelix/pregelix-example/src/test/resources/topology.xml new file mode 100755 index 0000000..2a6c380 --- /dev/null +++ b/pregelix/pregelix-example/src/test/resources/topology.xml
@@ -0,0 +1,7 @@ +<cluster-topology> + <network-switch name="Global"> + <network-switch name="local"> + <terminal name="127.1.0.1"/> + </network-switch> + </network-switch> +</cluster-topology> \ No newline at end of file