|
|
@@ -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(60)
|
|
|
+ time.sleep(30)
|
|
|
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, 30), (20, 20), (40, 10), (60, 10), (80, 10), (100, 10)]
|
|
|
+ add_weight_list = [(10, 10), (20, 10), (40, 10), (60, 10), (80, 10), (100, 10)]
|
|
|
utils.set_instance_weight_process_with_slbs(client=slb_client,
|
|
|
slb_id_list=longvideo_config.slb_id_list,
|
|
|
instance_id_list=health_instance_ids,
|
|
|
@@ -165,12 +165,13 @@ 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, 60)])
|
|
|
+ weight_list=[(0, 30)])
|
|
|
logging.info(f"set weight with 0 finished, instances: {instance_id_list}")
|
|
|
# 2. 异步移除旧容器并删除旧镜像
|
|
|
global remove_container_instances
|
|
|
remove_container_instances = []
|
|
|
- container_name = 'longvideoapi'
|
|
|
+ # container_name = 'longvideoapi'
|
|
|
+ container_name = 'vlogapi'
|
|
|
loop = asyncio.get_running_loop()
|
|
|
executor = ThreadPoolExecutor(max_workers=max_workers)
|
|
|
tasks = [
|
|
|
@@ -205,12 +206,12 @@ async def update_instance(create_client, slb_client, instance_ids, max_workers,
|
|
|
# 6. 挂载流量
|
|
|
if len(health_instances) == len(instance_id_list):
|
|
|
# 所有机器探活成功
|
|
|
- time.sleep(60)
|
|
|
+ time.sleep(30)
|
|
|
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, 30), (20, 20), (40, 10), (60, 10), (80, 10), (100, 10)]
|
|
|
+ add_weight_list = [(10, 10), (20, 10), (40, 10), (60, 10), (80, 10), (100, 10)]
|
|
|
utils.set_instance_weight_process_with_slbs(client=slb_client,
|
|
|
slb_id_list=longvideo_config.slb_id_list,
|
|
|
instance_id_list=health_instance_ids,
|
|
|
@@ -283,6 +284,8 @@ def main():
|
|
|
|
|
|
# 1. 获取slb下所有机器
|
|
|
online_instance_ids = utils.get_instance_ids(client=slb_client, slb_id=longvideo_config.slb_id_list[0])
|
|
|
+ online_instance_ids = online_instance_ids[:2]
|
|
|
+ # online_instance_ids = online_instance_ids[2:]
|
|
|
online_instance_count = len(online_instance_ids)
|
|
|
logging.info(f"online instance count: {online_instance_count}.")
|
|
|
logging.info(f"online instance ids: {online_instance_ids}")
|
heyudev