ootest

odbctest/mql/ootest.sh

@@ -23,6 +23,8 @@ parseargs() {
 }
 parseargs "$@"
 
+odbver=`./mql odbver? log.level=error "$@"`
+odbpath=`./mql odbpath? log.level=error "$@"`
 keyspace=`./mql keyspace? log.level=error "$@"`
 if [[ `echo "${keyspace}" | wc -w` == "1" ]]; then
     logfile="${keyspace}.test.log"
@@ -38,17 +40,15 @@ if [[ "$bgmode" == "" ]]; then
     exit 0
 fi
 
-last_odbserver=`./mqltest.sh - "help()" | grep "omdb version" | awk -F '"' '{print $4}' |  awk -F " omdb " '{print "omdb " $2}'`
+last_odbserver="$odbver"
 
 wait_odbserver_change() {
     while true; do
-        odbserver=`./mqltest.sh - "help()" | grep "omdb version" | awk -F '"' '{print $4}' |  awk -F " omdb " '{print "omdb " $2}'`
-        if [[ "${odbserver:0:12}" == "omdb version" ]]; then
-            if [[ "$odbserver" != "$last_odbserver" ]]; then
-                # wait for sync files complete
-                sleep 10
-                return 0
-            fi
+        odbver=`./mql odbver? log.level=error "$@"`
+        if [[ "$odbver" != "$last_odbserver" ]]; then
+            # wait for sync files complete
+            sleep 10
+            return 0
         fi
         sleep 2
     done
@@ -58,36 +58,29 @@ n=0
 while [[ true ]]; do
     ret=0
     n=`expr $n + 1`
-    odbserver=`./mqltest.sh - "help()" | grep "omdb version" | awk -F '"' '{print $4}' |  awk -F " omdb " '{print "omdb " $2}'`
-    if [[ "${odbserver:0:12}" == "omdb version" ]]; then
-        if [[ "$odbserver" != "$last_odbserver" ]]; then
-            echo "odbserver changed" >> changed.log
-            echo "$last_odbserver" >> changed.log
-            echo "$odbserver" >> changed.log
-            if [[ "${odbserver:42:14}" == "${last_odbserver:42:14}" ]]; then
-                codechanged=0
-            else
-                codechanged=1
-            fi
-            last_odbserver="$odbserver"
-            if [[ "$noinit" != "1" && "$codechanged" == "1" ]]; then
-                ./initkeyspace.sh $keyspace
-                ret=$?
-                if [[ "$ret" != "0" ]]; then
-                    # init error
-                    n=0
-                else
-                    n=1
-                fi
+    odbver=`./mql odbver? log.level=error "$@"`
+    if [[ "$odbver" != "$last_odbserver" ]]; then
+        echo "odbserver changed" >> changed.log
+        echo "$last_odbserver" >> changed.log
+        echo "$odbver" >> changed.log
+        last_odbserver="$odbver"
+        if [[ "$noinit" != "1" ]]; then
+            ./initkeyspace.sh $keyspace
+            ret=$?
+            if [[ "$ret" != "0" ]]; then
+                # init error
+                n=0
             else
                 n=1
             fi
+        else
+            n=1
         fi
     fi
     if [[ "$n" != "0" ]]; then
         cd "$CWD"
         PROCFLAG="test$n"
-        endflag="$odbserver end of test $n return"
+        endflag="$odbver end of test $n return"
         ttt=`date +'%Y%m%d%H%M%S'`
         check_odbserver() {
             sleep 10
@@ -96,12 +89,10 @@ while [[ true ]]; do
                 if [[ "$mqlproc" == "" ]]; then
                     return 0
                 fi
-                odbserver=`./mqltest.sh - "help()" | grep "omdb version" | awk -F '"' '{print $4}' |  awk -F " omdb " '{print "omdb " $2}'`
-                if [[ "${odbserver:0:12}" == "omdb version" ]]; then
-                    if [[ "$odbserver" != "$last_odbserver" ]]; then
-                        ps -ef | grep -v grep | grep mql | grep "proc.flag=${PROCFLAG}" | awk '{print $2}' | xargs kill -9
-                        return 0
-                    fi
+                odbver=`./mql odbver? log.level=error "$@"`
+                if [[ "$odbver" != "$last_odbserver" ]]; then
+                    ps -ef | grep -v grep | grep mql | grep "proc.flag=${PROCFLAG}" | awk '{print $2}' | xargs kill -9
+                    return 0
                 fi
                 sleep 10
             done