feat:修改定时任务脚本

ad/01_ad_model_update_everyday.sh

@@ -13,7 +13,7 @@ MODEL_PATH=/root/zhaohp/recommend-emr-dataprocess/model
 PREDICT_PATH=/root/zhaohp/recommend-emr-dataprocess/predict
 HADOOP=/opt/apps/HADOOP-COMMON/hadoop-common-current/bin/hadoop
 FM_HOME=/root/sunmingze/alphaFM
-OSS_PATH=oss://art-recommend.oss-cn-hangzhou.aliyuncs.com/ad_model/
+OSS_PATH=oss://art-recommend.oss-cn-hangzhou.aliyuncs.com/zhangbo/
 max_hour=17
 max_minute=00
 OSS_ONLINE_MODEL_PATH=${OSS_PATH}/${model_name}.txt
@@ -23,7 +23,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
 
-## 1 判断依赖的数据表是否生产完成
+# 1 判断依赖的数据表是否生产完成
 source /root/anaconda3/bin/activate py37
 while true; do
   python_return_code=$(python ad/ad_utils.py --excute_program check_ad_origin_hive --partition ${today} --hh 10)
@@ -93,7 +93,6 @@ fi
 
 
 # 5 对比AUC
-# 5.1 校验今天10分区的数据是否生产完成
 $HADOOP fs -text ${bucketFeatureSavePath}/${today}/* | ${FM_HOME}/bin/fm_predict -m ${LAST_MODEL_HOME}/model_online.txt -dim 8 -core 8 -out ${PREDICT_PATH}/${model_name}_${today}_online.txt
 $HADOOP fs -text ${bucketFeatureSavePath}/${today}/* | ${FM_HOME}/bin/fm_predict -m ${MODEL_PATH}/${model_name}_${today_early_1}.txt -dim 8 -core 8 -out ${PREDICT_PATH}/${model_name}_${today}_new.txt
 
@@ -144,23 +143,23 @@ if [ $? -ne 0 ]; then
 fi
 
 # 7 模型文件上传OSS
-#online_model_path=${OSS_PATH}/${model_name}.txt
-#$HADOOP fs -test -e ${online_model_path}
-#if [ $? -eq 0 ]; then
-#    echo "数据存在, 先删除。"
-#    $HADOOP fs -rm -r ${online_model_path}
-#else
-#    echo "数据不存在"
-#fi
-#
-#$HADOOP fs -put ${MODEL_PATH}/${model_name}_${today_early_1}_change.txt ${online_model_path}
-#if [ $? -eq 0 ]; then
-#   echo "推荐模型文件至OSS成功"
-#else
-#   echo "推荐模型文件至OSS失败"
-#   /root/anaconda3/bin/python ad/ad_monitor_util.py "推荐模型文件至OSS失败"
-#   exit 1
-#fi
+online_model_path=${OSS_PATH}/${model_name}.txt
+$HADOOP fs -test -e ${online_model_path}
+if [ $? -eq 0 ]; then
+    echo "数据存在, 先删除。"
+    $HADOOP fs -rm -r -skipTrash ${online_model_path}
+else
+    echo "数据不存在"
+fi
+
+$HADOOP fs -put ${MODEL_PATH}/${model_name}_${today_early_1}_change.txt ${online_model_path}
+if [ $? -eq 0 ]; then
+   echo "推荐模型文件至OSS成功"
+else
+   echo "推荐模型文件至OSS失败"
+   /root/anaconda3/bin/python ad/ad_monitor_util.py "推荐模型文件至OSS失败"
+   exit 1
+fi
 
 # 7.3 本地保存最新的线上使用的模型，用于下一次的AUC验证
 cp -f ${LAST_MODEL_HOME}/model_online.txt ${LAST_MODEL_HOME}/model_online_$(date +\%Y\%m\%d).txt