Merge branch 'region-h-ab' into test

recommend.py

@@ -220,9 +220,12 @@ def video_recommend(request_id, mid, uid, size, top_K, flow_pool_P, app_type, al
     #          gevent.spawn(pool_recall.flow_pool_recall, size),
     #          gevent.spawn(pool_recall.old_videos_recall, size)]
     else:
-        t = [gevent.spawn(pool_recall.rov_pool_recall, size, expire_time),
-             gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
-             gevent.spawn(pool_recall.flow_pool_recall, size)]
+        if app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
+            t = [gevent.spawn(pool_recall.rov_pool_recall, size, expire_time)]
+        else:
+            t = [gevent.spawn(pool_recall.rov_pool_recall, size, expire_time),
+                 gevent.spawn(pool_recall.flow_pool_recall, size, config_.QUICK_FLOW_POOL_ID),
+                 gevent.spawn(pool_recall.flow_pool_recall, size)]
     gevent.joinall(t)
     recall_result_list = [i.get() for i in t]
 

video_recall.py

@@ -467,7 +467,15 @@ class PoolRecall(object):
             video_mapping = {}
             video_score = {}
             for value in data:
-                video_id, flow_pool = value[0].split('-')
+                try:
+                    video_id, flow_pool = value[0].split('-')
+                except Exception as e:
+                    log_.error({
+                        'request_id': self.request_id,
+                        'app_type': self.app_type,
+                        'flow_pool_value': value
+                    })
+                    continue
                 video_id = int(video_id)
                 if video_id not in video_ids:
                     video_ids.append(video_id)