| commit | ed8b8ebc21b9da5499eedc374a91bd155a64b4c2 | [log] [tgz] |
|---|---|---|
| author | anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 08:23:28 2013 +0000 |
| committer | anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 08:23:28 2013 +0000 |
| tree | 49b987f40f5189f11a10faf60126012c62372380 | |
| parent | b9dd63c1705cf84afbe71410b2086f602a3426a6 [diff] [blame] |
svn merge -r3112:3163 https://hyracks.googlecode.com/svn/branches/fullstack_asterix_stabilization svn merge -r3173:3188 https://hyracks.googlecode.com/svn/branches/fullstack_release_candidate@3234 svn merge -r3209:3233 https://hyracks.googlecode.com/svn/trunk/fullstack git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3237 123451ca-8445-de46-9d55-352943316053
diff --git a/hivesterix/hivesterix-dist/src/main/resources/scripts/startcc.sh b/hivesterix/hivesterix-dist/src/main/resources/scripts/startcc.sh index fe2551d..484ecac 100644 --- a/hivesterix/hivesterix-dist/src/main/resources/scripts/startcc.sh +++ b/hivesterix/hivesterix-dist/src/main/resources/scripts/startcc.sh
@@ -22,4 +22,10 @@ #Launch hyracks cc script chmod -R 755 $HYRACKS_HOME -$HYRACKS_HOME/hyracks-server/target/appassembler/bin/hyrackscc -client-net-ip-address $CCHOST -cluster-net-ip-address $CCHOST -client-net-port $CC_CLIENTPORT -cluster-net-port $CC_CLUSTERPORT -max-heartbeat-lapse-periods 999999 -default-max-job-attempts 0 -job-history-size 3 &> $CCLOGS_DIR/cc.log & +if [ -f "conf/topology.xml" ]; then +#Launch hyracks cc script with topology +$HYRACKS_HOME/hyracks-server/target/appassembler/bin/hyrackscc -client-net-ip-address $CCHOST -cluster-net-ip-address $CCHOST -client-net-port $CC_CLIENTPORT -cluster-net-port $CC_CLUSTERPORT -max-heartbeat-lapse-periods 999999 -default-max-job-attempts 0 -job-history-size 0 -cluster-topology "conf/topology.xml" &> $CCLOGS_DIR/cc.log & +else +#Launch hyracks cc script without toplogy +$HYRACKS_HOME/hyracks-server/target/appassembler/bin/hyrackscc -client-net-ip-address $CCHOST -cluster-net-ip-address $CCHOST -client-net-port $CC_CLIENTPORT -cluster-net-port $CC_CLUSTERPORT -max-heartbeat-lapse-periods 999999 -default-max-job-attempts 0 -job-history-size 0 &> $CCLOGS_DIR/cc.log & +fi