trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svar...@apache.org
Subject [2/4] incubator-trafodion git commit: [TRAFODION-2256] Expand error check to initialize upgrade case as well
Date Fri, 18 Nov 2016 23:34:06 GMT
[TRAFODION-2256] Expand error check to initialize upgrade case as well

Per review comment.


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

Branch: refs/heads/master
Commit: a9c039d39522df5506a059e6480a1ebc425adf9b
Parents: 88b5c68
Author: Steve Varnau <svarnau@apache.org>
Authored: Tue Nov 15 17:30:58 2016 +0000
Committer: Steve Varnau <svarnau@apache.org>
Committed: Tue Nov 15 17:30:58 2016 +0000

----------------------------------------------------------------------
 install/installer/traf_start | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a9c039d3/install/installer/traf_start
----------------------------------------------------------------------
diff --git a/install/installer/traf_start b/install/installer/traf_start
index 8efbf8b..e852b5c 100755
--- a/install/installer/traf_start
+++ b/install/installer/traf_start
@@ -61,14 +61,13 @@ else
           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
+              ssh $STARTING_NODE "cd $SQ_ROOT/sql/scripts;  echo \"initialize Trafodion,
upgrade;\" | sqlci" | tee $SQ_ROOT/initializeErrors.txt
            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
+       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


Mime
View raw message