feat:添加评估结果分析脚本

ad/01_ad_model_update.sh

@@ -5,7 +5,7 @@ export PATH=$SPARK_HOME/bin:$PATH
 export HADOOP_CONF_DIR=/etc/taihao-apps/hadoop-conf
 export JAVA_HOME=/usr/lib/jvm/java-1.8.0
 
-sh_path=$(dirname $0)
+sh_path=$(cd $(dirname $0); pwd)
 source ${sh_path}/00_common.sh
 
 source /root/anaconda3/bin/activate py37
@@ -278,35 +278,40 @@ model_predict() {
 
 model_upload_oss() {
 
-  local step_start_time=$(date +%s)
+  (
+    local step_start_time=$(date +%s)
+
+    cd ${model_local_home}
 
-  cd ${model_local_home}
+    ${HADOOP} fs -get ${model_save_path} ${model_name}
+    if [ ! -d ${model_name} ]; then
+      echo "从HDFS下载模型失败"
+      check_run_status 1 $step_start_time "HDFS下载模型任务" 
+      exit 1 
+    fi
 
-  ${HADOOP} fs -get ${model_save_path} ${model_name}
-  if [ ! -d ${model_name} ]; then
-    echo "从HDFS下载模型失败"
-    check_run_status 1 $step_start_time "HDFS下载模型任务" 
-    exit 1 
-  fi
+    tar -czvf ${model_name}.tar.gz -C ${model_name} .
 
-  tar -czvf ${model_name}.tar.gz -C ${model_name} .
+    rm -rf ${model_name}.tar.gz.crc
 
-  rm -rf ${model_name}.tar.gz.crc
+    ${HADOOP} fs -rm -r -skipTrash ${MODEL_OSS_PATH}/${model_name}.tar.gz
+    
+    ${HADOOP} fs -put ${model_name}.tar.gz ${MODEL_OSS_PATH}
+    local return_code=$?
+    check_run_status $return_code $step_start_time "模型上传OSS任务"
+  )
 
-  ${HADOOP} fs -rm -r -skipTrash ${MODEL_OSS_PATH}/${model_name}.tar.gz
-  
-  ${HADOOP} fs -put ${model_name}.tar.gz ${MODEL_OSS_PATH}
   local return_code=$?
-  check_run_status $return_code $step_start_time "模型上传OSS"
+  check_run_status $return_code $step_start_time "模型上传OSS任务"
 
   echo ${model_save_path} > ${model_path_file}
 
-  local step_end_time=$(date +%s)
-  local elapsed=$(($step_end_time - $start_time))
-
   rm -f ./${model_name}.tar.gz
   rm -rf ./${model_name}
 
+  local step_end_time=$(date +%s)
+  local elapsed=$(($step_end_time - $start_time))
+
   echo -e "$LOG_PREFIX -- 模型更新完成 -- 模型更新成功: 耗时 $elapsed"
   local msg="\n\t - 广告模型文件更新完成 \n\t - 前一天线上模型全天Top差异平均值: ${old_incr_rate_avg} \n\t - 前一天线上模型全天Top差异: ${old_incr_rate_list} \n\t - 前一天新模型全天Top10差异平均值: ${new_incr_rate_avg} \n\t - 前一天新模型全天Top差异: ${new_incr_rate_list} \n\t - 模型上传路径: ${MODEL_OSS_PATH}/${model_name}.tar.gz"
   /root/anaconda3/bin/python ${sh_path}/ad_monitor_util.py --level info --msg ${msg} --start "${start_time}" --elapsed "${elapsed}"