Switch RAMCloud to Stanford release version
- Switch RAMCloud source code to 1.0 release + patches
- WARN: RAMCloud binary is going to be built to obj.master instead of obj.blueprint-java
- Fix JNI code to follow TableEnumerator related API change
- Build JNI library inside ONOS directory
- Remove non-source code artifact related to BluePrint
- Output ZooKeeper log to onos-logs
Change-Id: Id6fbf9418d6b3ce2e560bbf24b405c4ccc80a8e6
diff --git a/start-ramcloud-coordinator.sh b/start-ramcloud-coordinator.sh
index 6a4232e..3bd3e39 100755
--- a/start-ramcloud-coordinator.sh
+++ b/start-ramcloud-coordinator.sh
@@ -1,6 +1,5 @@
#!/bin/bash
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HOME}/ramcloud/bindings/java/edu/stanford/ramcloud:${HOME}/ramcloud/obj.blueprint-java
# Set paths
ONOS_HOME=`dirname $0`
@@ -10,6 +9,7 @@
coordinatorip=`grep coordinatorIp ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
coordinatorport=`grep coordinatorPort ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
RAMCLOUD_COORDINATOR=`echo $coordinatorip","$coordinatorport`
+RAMCLOUD_BRANCH=${RAMCLOUD_BRANCH:-master}
function lotate {
logfile=$1
@@ -35,7 +35,7 @@
# Run ramcloud
echo "Starting ramcloud coordinator"
- $RAMCLOUD_DIR/obj.blueprint-java/coordinator -L $RAMCLOUD_COORDINATOR > $RAMCLOUD_LOG 2>&1 &
+ $RAMCLOUD_DIR/obj.${RAMCLOUD_BRANCH}/coordinator -L $RAMCLOUD_COORDINATOR > $RAMCLOUD_LOG 2>&1 &
}
function stop {
@@ -72,7 +72,7 @@
# deldb
# ;;
status)
- n=`pgrep -f obj.blueprint-java/coordinator | wc -l`
+ n=`pgrep -f obj.${RAMCLOUD_BRANCH}/coordinator | wc -l`
echo "$n ramcloud coordinator is running"
;;
*)