瀏覽代碼

添加注释

zhangbo 1 年之前
父節點
當前提交
a901fb9fe3
共有 3 個文件被更改,包括 8 次插入6 次删除
  1. 2 2
      alg_recsys_recall_1h_region.py
  2. 1 0
      alg_recsys_recall_24h_region.py
  3. 5 4
      alg_recsys_recall_hour_region_task.sh

+ 2 - 2
alg_recsys_recall_1h_region.py

@@ -43,10 +43,9 @@ RULE_PARAMS = {
     'data_params': config_.DATA_PARAMS,
     'params_list': [
         # 532
-        {'data': 'data66', 'rule': 'rule66'},  # 523-> 523 & 518
+        # {'data': 'data66', 'rule': 'rule66'},  # 523-> 523 & 518
         {'data': 'data66', 'rule': 'rule67'},  # 523->510
         {'data': 'data66', 'rule': 'rule68'},  # 523->514
-        # {'data': 'data66', 'rule': 'rule69'},  # 523->518
     ],
 }
 
@@ -1141,6 +1140,7 @@ def h_timer_check():
             log_.info('----------当前分钟超过40,使用bottom的data,完成----------')
         else:
             # 数据没准备好,1分钟后重新检查
+            log_.info("上游数据未就绪,等待...")
             Timer(60, h_timer_check).start()
         # send_msg_to_feishu(
         #     webhook=config_.FEISHU_ROBOT['server_robot'].get('webhook'),

+ 1 - 0
alg_recsys_recall_24h_region.py

@@ -436,6 +436,7 @@ def h_timer_check():
             log_.info('----------当前分钟超过40,使用bottom的data,完成----------')
         else:
             # 数据没准备好,1分钟后重新检查
+            log_.info("上游数据未就绪,等待...")
             Timer(60, h_timer_check).start()
 
     except Exception as e:

+ 5 - 4
alg_recsys_recall_hour_region_task.sh

@@ -1,8 +1,8 @@
 source /etc/profile
 echo $ROV_OFFLINE_ENV
-if [ ! -d "logs_dir" ]; then
+if [ ! -d "my_logs" ]; then
     # 如果文件夹不存在,则创建文件夹
-    mkdir logs_dir
+    mkdir my_logs
 fi
 cur_time="`date +%Y%m%d`"
 cur_h="`date +%H`"
@@ -10,12 +10,13 @@ echo "开始执行时间:{$cur_time}-{$cur_h}"
 
 if [[ $ROV_OFFLINE_ENV == 'test' ]]; then
   cd /root/zhangbo/rov-offline
+  /root/anaconda3/bin/python alg_recsys_recall_1h_region.py &
   /root/anaconda3/bin/python alg_recsys_recall_24h_noregion.py &
   /root/anaconda3/bin/python alg_recsys_recall_24h_region.py &
-
+  /root/anaconda3/bin/python alg_recsys_recall_1h_noregion.py
   wait
   echo "并行执行时间:{$(date "+%Y-%m-%d %H:%M:%S")}"
-  /root/anaconda3/bin/python alg_recsys_recall_1h_region.py '24h'
+  /root/anaconda3/bin/python alg_recsys_recall_aftermerge.py
   echo "结束执行时间:{$(date "+%Y-%m-%d %H:%M:%S")}"
   echo "all done"
 elif [[ $ROV_OFFLINE_ENV == 'pro' ]]; then