oktest

odbctest/mql/oktest.sh

@@ -55,24 +55,31 @@ while [[ true ]]; do
     if [[ -e ~/odbserver/odbserver ]]; then
         cp -f ~/odbserver/odbserver ~/odbserver/odbserver.new
         odbserver=`~/odbserver/odbserver.new -version`
-        if [[ "$odbserver" != "$last_odbserver" ]]; then
-            echo "odbserver changed" >> changed.log
-            echo "$last_odbserver" >> changed.log
-            echo "$odbserver" >> changed.log
-            ./sync.sh
-            cp -pf ~/odbserver/odbserver /opt/matrix/odbserver/odbserver
-            last_odbserver="$odbserver"
+        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
+                ./sync.sh
+                cp -pf ~/odbserver/odbserver /opt/matrix/odbserver/odbserver
+                if [[ "${odbserver:42:14}" == "${last_odbserver:42:14}" ]]; then
+                    verchanged=0
+                else
+                    verchanged=1
+                fi
+                last_odbserver="$odbserver"
 
-            if [[ "noinit" != "1" ]]; then
-                ./initkeyspace.sh $keyspace
-                ret=$?
-                if [[ "$ret" != "0" ]]; then
-                    n=0
+                if [[ "$noinit" != "1" && "$verchanged" == "1" ]]; then
+                    ./initkeyspace.sh $keyspace
+                    ret=$?
+                    if [[ "$ret" != "0" ]]; then
+                        n=0
+                    else
+                        n=1
+                    fi
                 else
                     n=1
                 fi
-            else
-                n=1
             fi
         fi
     fi 
@@ -91,9 +98,11 @@ while [[ true ]]; do
                 if [[ -e ~/odbserver/odbserver ]]; then
                     cp -f ~/odbserver/odbserver ~/odbserver/odbserver.new
                     odbserver=`~/odbserver/odbserver.new -version`
-                    if [[ "$odbserver" != "$last_odbserver" ]]; then
-                        ps -ef | grep -v grep | grep mql | grep "proc.flag=${PROCFLAG}" | awk '{print $2}' | xargs kill -9
-                        return 0
+                    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
                     fi
                 fi
                 sleep 10
@@ -103,7 +112,7 @@ while [[ true ]]; do
             ./mqltest.sh "proc.flag=${PROCFLAG}" "$@"
             ret=$?
             echo "$endflag $ret" >> $logfile
-            if [[ "$ret" = "0" ]]; then
+            if [[ "$ret" == "0" ]]; then
                 sleep 5
             fi
             return $ret