commit d59f404e64109ec248e3bbd951eb5cb7132efbc1
author Pavlin Radoslavov <pavlin@onlab.us> Wed Apr 03 23:14:38 2013 +0000
committer Pavlin Radoslavov <pavlin@onlab.us> Wed Apr 03 23:14:38 2013 +0000
tree af8e8942f5b2c03b396ce28a571b0f97a84e741c
parent dbaa743d6a060d80a21f424ccd00c28770b48f4e
parent 831d48280818f6fd07e14f68d67567c43c3319cc

Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONOS

cluster-mgmt/bin/func.sh

diff --git a/cluster-mgmt/bin/func.sh b/cluster-mgmt/bin/func.sh
index 05c2adb..9785e66 100755
--- a/cluster-mgmt/bin/func.sh
+++ b/cluster-mgmt/bin/func.sh
@@ -83,6 +83,10 @@
       echo "Removing all data in db"
       dsh -w ${basename}1 "cd $ONOS_DIR; ./scripts/cleanup-cassandra.sh"
       ;;
+    checkdb)
+      echo "Check DB Status"
+      dsh -w ${basename}1 "cd $ONOS_DIR; ./scripts/check-db-status.sh"
+      ;;
     status)
       echo "Checking Cassandra Status"
       dsh -w ${basename}1 "cd $ONOS_DIR; ./start-cassandra.sh status"

cluster-mgmt/bin/start.sh

diff --git a/cluster-mgmt/bin/start.sh b/cluster-mgmt/bin/start.sh
index dac6bb1..23fcde7 100755
--- a/cluster-mgmt/bin/start.sh
+++ b/cluster-mgmt/bin/start.sh
@@ -9,5 +9,11 @@
 zk start
 cassandra start
 cassandra cleandb
+db_status=`cassandra checkdb |grep OK | wc -l`
+if [ $db_status != 1 ];then
+  echo $db_status
+  echo "Cassandra DB was screwed up. Need DB key drop"
+  exit
+fi
 onos start
 dsh -g $basename 'cd ONOS; ./ctrl-local.sh'