optimize sleep

ess_longvideo.py

@@ -88,11 +88,11 @@ async def ess_instance(create_client, slb_client, ess_count, max_workers):
     # 5. 挂载流量
     if len(health_instances) > 0:
         # 所有机器探活成功
-        time.sleep(60)
+        time.sleep(20)
         utils.add_backend_servers_with_slbs(client=slb_client,
                                             slb_id_list=longvideo_config.slb_id_list,
                                             instances=health_instances)
-        add_weight_list = [(10, 10), (20, 10), (40, 10), (60, 10), (80, 10), (100, 10)]
+        add_weight_list = [(10, 5), (20, 5), (40, 5), (60, 5), (80, 5), (100, 5)]
         health_instance_ids = [instance_id for instance_id, _ in health_instances]
         utils.set_instance_weight_process_with_slbs(client=slb_client,
                                                     slb_id_list=longvideo_config.slb_id_list,

longvideo_restart.py

@@ -20,7 +20,7 @@ def server_restart(slb_client, instance_id, image_name):
         utils.set_instance_weight_process_with_slbs(client=slb_client,
                                           slb_id_list=longvideo_config.slb_id_list,
                                           instance_id_list=[instance_id],
-                                          weight_list=[(0, 30)])
+                                          weight_list=[(0, 15)])
 
         logging.info(f"set weight with 0 finished.")
         # 3. 重启容器
@@ -30,10 +30,10 @@ def server_restart(slb_client, instance_id, image_name):
         logging.info(f"docker restart finished.")
         # 4. 探活
         server_health_check(slb_client, instance_id)
-        time.sleep(30)
+        time.sleep(10)
         logging.info(f"health check finished.")
         # 5. 挂流量
-        add_weight_list = [(10, 10), (20, 10), (40, 10), (60, 10), (80, 10), (100, 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_id],

longvideo_update.py

@@ -80,12 +80,12 @@ async def ess_instance(create_client, slb_client, ess_count, max_workers, versio
     # 5. 挂载流量
     if len(health_instances) == len(ess_instance_ids):
         # 所有机器探活成功
-        time.sleep(30)
+        time.sleep(10)
         utils.add_backend_servers_with_slbs(client=slb_client,
                                             slb_id_list=longvideo_config.slb_id_list,
                                             instances=health_instances)
         health_instance_ids = [instance_id for instance_id, _ in health_instances]
-        add_weight_list = [(10, 10), (20, 10), (40, 10), (60, 10), (80, 10), (100, 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=health_instance_ids,
@@ -173,7 +173,7 @@ async def update_instance(create_client, slb_client, instance_ids, max_workers,
         utils.set_instance_weight_process_with_slbs(client=slb_client,
                                                     slb_id_list=longvideo_config.slb_id_list,
                                                     instance_id_list=instance_id_list,
-                                                    weight_list=[(0, 30)])
+                                                    weight_list=[(0, 15)])
         logging.info(f"set weight with 0 finished, instances: {instance_id_list}")
         # 2. 异步移除旧容器并删除旧镜像
         global remove_container_instances
@@ -214,12 +214,12 @@ async def update_instance(create_client, slb_client, instance_ids, max_workers,
         # 6. 挂载流量
         if len(health_instances) == len(instance_id_list):
             # 所有机器探活成功
-            time.sleep(30)
+            time.sleep(10)
             utils.add_backend_servers_with_slbs(client=slb_client,
                                                 slb_id_list=longvideo_config.slb_id_list,
                                                 instances=health_instances)
             health_instance_ids = [instance_id for instance_id, _ in health_instances]
-            add_weight_list = [(10, 10), (20, 10), (40, 10), (60, 10), (80, 10), (100, 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=health_instance_ids,
@@ -244,7 +244,7 @@ def remove_instances(create_client, slb_client, instance_ids):
     utils.set_instance_weight_process_with_slbs(client=slb_client,
                                                 slb_id_list=longvideo_config.slb_id_list,
                                                 instance_id_list=instance_ids,
-                                                weight_list=[(0, 60)])
+                                                weight_list=[(0, 20)])
     logging.info(f"set weight = 0 finished, instances: {instance_ids}")
     time.sleep(10)
     # 2.移除slb
@@ -267,7 +267,7 @@ def remove_instances(create_client, slb_client, instance_ids):
                 break
             else:
                 logging.info(f"stopped instances count = {len(stopped_instances)}, instances: {stopped_instances}")
-                time.sleep(10)
+                time.sleep(5)
         else:
             logging.error(response)
             sys.exit()