odbctest/mql/mqltest.sh

@@ -52,7 +52,7 @@ if [[ "${filescount}" == "1" ]]; then
     n=`ps -ef | grep "mql %@" | grep -v grep | wc -l`
     n=`expr $n + 1`
     logfile="${keyspace}.${n}test.log"
-    ./mql "$@" 2>&1 | tee ${logfile}
+    ./mql "$@" 2>&1 | tee -a ${logfile}
     exit $?
 fi
 
@@ -79,7 +79,7 @@ else
     n=`expr 0${n} + 1`
 fi
 echo "${n}" > ${keyspace}.test.count
-./mql "$@" "log.prefix=test $n" 2>&1 | tee ${logfile}
+./mql "$@" "log.prefix=test $n" 2>&1 | tee -a ${logfile}
 lastline=`tail -n 1 $logfile 2>&1`
 if [[ "$lastline" = "FAIL" ]]; then
     exit 123

odbctest/mql/ootest.sh

@@ -11,18 +11,6 @@ if [[ "${filescount}" == "0" || "${filescount}" == "1" ]]; then
     exit $?
 fi
 
-echo "" > changed.log
-
-parseargs() {
-    while [[ "$*" != "" ]]; do
-        if [[ "$1" == "init=no" ]]; then
-            noinit=1
-        fi
-        shift
-    done
-}
-parseargs "$@"
-
 keyspace=`./mql keyspace? log.level=error "$@"`
 if [[ `echo "${keyspace}" | wc -w` == "1" ]]; then
     logfile="${keyspace}.test.log"
@@ -31,24 +19,37 @@ else
 fi
 
 if [[ "$bgmode" == "" ]]; then
+    ps -ef | grep -v grep | grep "$0 bgmode=1" | awk '{print $2}' | xargs kill -9
+    echo "" > changed.log
     echo mql test running in background mode
     export bgmode=1
-    nohup "$0" "$@" 2>&1 >/dev/null &
+    nohup "$0" bgmode=1 "$@" 2>&1 >/dev/null &
     tail -F $logfile
     exit 0
 fi
 
-last_odbserver=`./mqltest.sh - "help()" | grep "omdb version" | awk -F '"' '{print $4}' |  awk -F " omdb " '{print "omdb " $2}'`
+parseargs() {
+    while [[ "$*" != "" ]]; do
+        if [[ "$1" == "init=no" ]]; then
+            noinit=1
+        fi
+        shift
+    done
+}
+parseargs "$@"
+
+odbver=`./mql odbver? log.level=error "$@"`
+odbpath=`./mql odbpath? log.level=error "$@"`
+last_odbserver="$odbver"
+echo "odbver=$last_odbserver" >> changed.log
 
 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 +59,30 @@ 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 "$@"`
+    echo "$odbver" >> changed.log
+    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"
+        PROCFLAG="ootest$n"
+        endflag="$odbver end of test $n return"
         ttt=`date +'%Y%m%d%H%M%S'`
         check_odbserver() {
             sleep 10
@@ -96,12 +91,12 @@ 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
+                    echo "$odbver" >> changed.log
+                    echo "kill last process" >> changed.log
+                    ps -ef | grep -v grep | grep mql | grep "proc.flag=${PROCFLAG}" | awk '{print $2}' | xargs kill -9
+                    return 0
                 fi
                 sleep 10
             done
@@ -115,13 +110,13 @@ while [[ true ]]; do
             fi
             return $ret
         }
-        check_odbserver &
+        check_odbserver "$@" &
         run "$@"
         ret=$?
     fi
     
     if [[ "$ret" != "0" && "$ret" != "99" ]]; then
-        echo "wait for odbserver upgrad" | tee $logfile
+        echo "wait for odbserver upgrad" | tee -a $logfile
         wait_odbserver_change
     fi
 done