|
|
@@ -61,12 +61,12 @@ async def ess_instance(ecs_client, alb_client, ess_count, max_workers, version,
|
|
|
|
|
|
# 2. 发送启动脚本到机器上
|
|
|
utils.send_file_to_ecs(ecs_client=ecs_client, instance_id_list=ess_instance_ids, **longvideoapi_config.start_sh)
|
|
|
- logging.info(f"send start shell file finished, instances: {ess_instance_ids}")
|
|
|
+ logging.info(f"send start shell file finished, count: {len(ess_instance_ids)} instances: {ess_instance_ids}")
|
|
|
# 3. 启动服务
|
|
|
server_start_sh = os.path.join(longvideoapi_config.start_sh['target_dir'], longvideoapi_config.start_sh['name'])
|
|
|
server_start_commend = f"sh {server_start_sh} {version}"
|
|
|
utils.run_command(ecs_client=ecs_client, instance_ids=ess_instance_ids, command=server_start_commend)
|
|
|
- logging.info(f"start server finish, instances: {ess_instance_ids}")
|
|
|
+ logging.info(f"start server finish, count: {len(ess_instance_ids)} instances: {ess_instance_ids}")
|
|
|
# 4. 异步探活
|
|
|
global health_instances
|
|
|
health_instances = []
|
|
|
@@ -86,10 +86,10 @@ async def ess_instance(ecs_client, alb_client, ess_count, max_workers, version,
|
|
|
# for server_group_id in longvideoapi_config.server_group_id_list:
|
|
|
# for instance_id in health_instance_ids:
|
|
|
utils.add_servers_to_server_group(alb_client, longvideoapi_config.server_group_id_list, health_instance_ids, weight=0, port=port)
|
|
|
- logging.info(f"Successfully added health_instance_ids {health_instance_ids} to server groups {longvideoapi_config.server_group_id_list}.")
|
|
|
+ logging.info(f"Successfully added count: {len(health_instance_ids)} health_instance_ids {health_instance_ids} to server groups {longvideoapi_config.server_group_id_list}.")
|
|
|
|
|
|
time.sleep(20)
|
|
|
- logging.info(f"start update weight instances: {health_instance_ids} server groups: {longvideoapi_config.server_group_id_list}.")
|
|
|
+ logging.info(f"start update weight count: {len(health_instance_ids)} instances: {health_instance_ids} server groups: {longvideoapi_config.server_group_id_list}.")
|
|
|
# add_weight_list = [(10, 5), (20, 5), (40, 5), (60, 5), (80, 5), (100, 5)]
|
|
|
add_weight_list = [(10, 10), (20, 10), (40, 10), (60, 10), (80, 10), (100, 10)]
|
|
|
utils.update_server_group_servers_attribute(alb_client,
|
|
|
@@ -183,7 +183,7 @@ async def update_instance(ecs_client, alb_client, instance_ids, max_workers, ver
|
|
|
instance_id_list=instance_id_list,
|
|
|
weight_list=[(0, 20)],
|
|
|
port=port)
|
|
|
- logging.info(f"set weight with 0 finished, instances: {instance_id_list}")
|
|
|
+ logging.info(f"set weight with 0 finished, count: {len(instance_id_list)} instances: {instance_id_list}")
|
|
|
# 2. 异步移除旧容器并删除旧镜像
|
|
|
global remove_container_instances
|
|
|
remove_container_instances = []
|
|
|
@@ -325,8 +325,7 @@ def main():
|
|
|
# 1. 获取alb下所有机器
|
|
|
online_instance_ids = utils.list_server_group_servers(alb_client=alb_client, server_group_id=longvideoapi_config.server_group_id_list[0])
|
|
|
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}")
|
|
|
+ logging.info(f"online instance count: {online_instance_count} instance_ids: {online_instance_ids}")
|
|
|
|
|
|
# 2. 扩容机器并启动新服务 扩容数量：线上机器数量//2
|
|
|
logging.info(f"ess instances start ...")
|
supeng