Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

db-utils/db_import.sh

@@ -27,6 +27,7 @@ fi
 # echo "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;" | mysql -h $mysql_host -P $target_db_port -uqa -pqatest
 echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;\""
 mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e "CREATE DATABASE IF NOT EXISTS \`${database_name}\` DEFAULT CHARSET utf8 COLLATE utf8_general_ci;"
+if [ $? != 0 ];then echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest -e \"CREATE DATABASE ${database_name}\" error";exit -1; fi
 
 for entry in ./*.sql
 do

db-utils/db_schema_sync.sh

@@ -91,6 +91,7 @@ function db_schema_sync()
 
 	echo "--- Step 3: import basic data from backup file: $database $db_backup_sub_folders ---"
 	sh $work_dir/db_import.sh $database $target_db_host $db_backup_sub_folders $delete_business_data $target_db_port
+	if [ $? != 0 ];then echo "db_import.sh $database error";exit -1; fi
 	
 	echo "--- Step 4: sync schema: $database $target_db_host ---"
 	#sync_cmd="mss -conf ${config_file_name} -sync"