liqian 2 лет назад
Родитель
Сommit
5d94f50c59
3 измененных файлов с 3 добавлено и 22 удалено
  1. 0 10
      longvideo_quick_restart_with_ess.py
  2. 2 11
      rov_server_quick_restart_with_ess.py
  3. 1 1
      utils.py

+ 0 - 10
longvideo_quick_restart_with_ess.py

@@ -87,16 +87,6 @@ async def server_restart_all(slb_client, instance_id_list, image_name, max_worke
                                                         instance_id_list=[instance[0] for instance in health_instances],
                                                         weight_list=add_weight_list)
             logging.info(f"set weight finished instance count: {len(health_instances)}, {health_instances}")
-
-        elif len(health_instances) / len(instance_id_list) > 0.9:
-            time.sleep(10)
-            add_weight_list = [(10, 5), (20, 5), (40, 5), (60, 5), (80, 5), (100, 5)]
-            utils.set_instance_weight_process_with_slbs(client=slb_client,
-                                                        slb_id_list=longvideo_config.slb_id_list,
-                                                        instance_id_list=[instance[0] for instance in health_instances],
-                                                        weight_list=add_weight_list)
-            logging.info(f"set weight finished instance count: {len(health_instances)}, {health_instances}")
-
         else:
             logging.info(f"ess count: {len(instance_id_list)}, "
                          f"health count: {len(health_instances)}")

+ 2 - 11
rov_server_quick_restart_with_ess.py

@@ -88,15 +88,6 @@ async def server_restart_all(slb_client, instance_id_list, image_name, max_worke
                                               instance_id_list=[instance[0] for instance in health_instances],
                                               weight_list=add_weight_list)
             logging.info(f"set weight finished instance count: {len(health_instances)}, {health_instances}")
-        elif len(health_instances) / len(instance_id_list) > 0.9:
-            time.sleep(30)
-            add_weight_list = [(10, 30), (20, 20), (40, 10), (60, 10), (80, 10), (100, 10)]
-            utils.set_instance_weight_process(client=slb_client,
-                                              slb_id=rov_server_config.slb_id,
-                                              instance_id_list=[instance[0] for instance in health_instances],
-                                              weight_list=add_weight_list)
-            logging.info(f"set weight finished instance count: {len(health_instances)}, {health_instances}")
-
         else:
             logging.info(f"ess count: {len(instance_id_list)}, "
                          f"health count: {len(health_instances)}")
@@ -238,8 +229,8 @@ def main():
 
         # 3. 重启线上原有服务器
         image_name = 'rov-server'
-        asyncio.run(server_restart_all(slb_client=slb_client, instance_id_list=online_instance_ids,
-                                       image_name=image_name, max_workers=online_instance_count))
+        # asyncio.run(server_restart_all(slb_client=slb_client, instance_id_list=online_instance_ids,
+        #                                image_name=image_name, max_workers=online_instance_count))
         logging.info(f"server restart finished!")
 
         # 4. 停止并释放扩容机器

+ 1 - 1
utils.py

@@ -330,7 +330,7 @@ def set_instance_weight_process(client, slb_id, instance_id_list, weight_list):
         flag = True
         while flag:
             try:
-                set_weight_for_instances(client=client, slb_id=slb_id, instance_id_list=instance_id_list, weight=weight)
+                # set_weight_for_instances(client=client, slb_id=slb_id, instance_id_list=instance_id_list, weight=weight)
                 time.sleep(sleep_time)
                 flag = False
             except Exception as e: