trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svar...@apache.org
Subject [1/4] incubator-trafodion git commit: [TRAFODION-2256] installer not detecting true init errors
Date Fri, 18 Nov 2016 23:34:05 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 10e4bc826 -> a596155f9


[TRAFODION-2256] installer not detecting true init errors

Using Amanda's recommended fix.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/88b5c689
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/88b5c689
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/88b5c689

Branch: refs/heads/master
Commit: 88b5c689573d6386ac14bd87c14e4d3ee64d4051
Parents: 7ba7ee3
Author: Steve Varnau <svarnau@apache.org>
Authored: Wed Nov 9 22:33:13 2016 +0000
Committer: Steve Varnau <svarnau@apache.org>
Committed: Wed Nov 9 22:33:13 2016 +0000

----------------------------------------------------------------------
 install/installer/traf_start | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/88b5c689/install/installer/traf_start
----------------------------------------------------------------------
diff --git a/install/installer/traf_start b/install/installer/traf_start
index 8ab3d9c..8efbf8b 100755
--- a/install/installer/traf_start
+++ b/install/installer/traf_start
@@ -58,19 +58,19 @@ else
        error1392=$(grep "1392" $SQ_ROOT/initializeErrors.txt | wc -l)
        error1395=$(grep "1395" $SQ_ROOT/initializeErrors.txt | wc -l)
        if [ "$error1395" -ge "1" ] || [ "$error1392" -ge "1" ]; then
-          ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts;  echo \"get version of metadata;\"
| sqlci" | tee -a $SQ_ROOT/initalizeErrors.txt
+          ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts;  echo \"get version of metadata;\"
| sqlci" | tee -a $SQ_ROOT/initializeErrors.txt
            metadataCurrent=$(grep "Metadata is current" $SQ_ROOT/initializeErrors.txt | wc
-l)
            if [[ "$metadataCurrent" -ne "1" ]]; then
               ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts;  echo \"initialize Trafodion,
upgrade;\" | sqlci" | tee -a $SQ_ROOT/initializeErrors.txt
            fi
-        fi
-
-        if [ "$?" != "0" ]; then
-           echo "***ERROR: initialize Trafodion failed.  Check install log files for details."
| tee -a $INSTALL_LOG
-           exit -1;
-        fi
+       else
+          anyError=$(grep "ERROR" $SQ_ROOT/initializeErrors.txt | wc -l)
+          if [[ "$anyError" != "0" ]]; then
+             echo "***ERROR: initialize Trafodion failed.  Check install log files for details."
| tee -a $INSTALL_LOG
+             exit -1;
+          fi
+       fi
     fi
-
 fi
 #==========================================
 echo "***INFO: Installation setup completed successfully." | tee -a $INSTALL_LOG


Mime
View raw message