improt

longvideoapi/longvideoapi_grayscale_update.py

@@ -1,7 +1,7 @@
 import sys
 import time
 import requests
-from util import utils
+import utils
 import logging
 import os
 import docker
@@ -101,8 +101,8 @@ def update_instance(ecs_client, alb_client, instance_id, version, port):
     """
     logging.info(f"update instance: {instance_id}")
     # 1. 摘流量，将权重降为0
-    # health_instance_ids = [instance_id]
     # weight_list = [(0, 20)]  # 设置权重为0，等待20秒
+
     utils.update_server_group_servers_attribute(alb_client=alb_client,
                                                 server_group_id_list=longvideoapi_config.server_group_id_list,
                                                 instance_id_list=instance_id,

longvideoapi/longvideoapi_restart.py

@@ -2,14 +2,15 @@ import logging
 import time
 import docker
 import longvideoapi_config
-from util import utils
+from test.albtest import alb_client_params
+import utils
 from longvideoapi_update_k import server_health_check
 
 logging.basicConfig(level=logging.INFO,
                     format='%(asctime)s %(filename)s[line:%(lineno)d] %(levelname)s %(message)s',
                     datefmt='%a, %d %b %Y %H:%M:%S')
 
-def server_restart(ecs_client, alb_client, instance_id, image_name, port):
+def server_restart(alb_client, ecs_client, instance_id, image_name, port):
     try:
         logging.info(f"Restarting instance: {instance_id}")
         # 获取ip
@@ -19,7 +20,7 @@ def server_restart(ecs_client, alb_client, instance_id, image_name, port):
         # 摘流量
         utils.update_server_group_servers_attribute(alb_client=alb_client,
                                                     server_group_id_list=longvideoapi_config.server_group_id_list,
-                                                    instance_id_list=instance_id,
+                                                    instance_id_list=[instance_id],
                                                     weight_list=[(0, 20)],
                                                     port=port)
         logging.info(f"Set weight to 0 for instance: {instance_id}")
@@ -37,7 +38,7 @@ def server_restart(ecs_client, alb_client, instance_id, image_name, port):
 
         # 设置权重
         add_weight_list = [(10, 5), (20, 5), (40, 5), (60, 5), (80, 5), (100, 5)]
-        utils.update_server_group_servers_attribute(alb_client,
+        utils.update_server_group_servers_attribute(alb_client=alb_client,
                                                     server_group_id_list=longvideoapi_config.server_group_id_list,
                                                     instance_id_list=instance_id,
                                                     weight_list=add_weight_list,
@@ -70,7 +71,7 @@ def main():
         # 逐台重启
         image_name = 'longvideoapi'
         for i, instance_id in enumerate(online_instance_ids):
-            server_restart(ecs_client=ecs_client, alb_client=alb_client, instance_id=instance_id, image_name=image_name, port=longvideoapi_config.port)
+            server_restart(alb_client=alb_client, ecs_client=ecs_client, instance_id=instance_id, image_name=image_name, port=longvideoapi_config.port)
             logging.info(f"Restart progress: {i + 1}/{online_instance_count}")
         logging.info("All servers restarted successfully!")
     except Exception as e:

longvideoapi/utils.py

@@ -283,8 +283,10 @@ def send_request(ecs_client, request):
     :param request: 请求配置
     :return: response
     """
-    print(ecs_client, request)
     print(2222222222)
+    print(ecs_client, request)
+    print(3333333333)
+
     request.set_accept_format('json')
     try:
         response = ecs_client.do_action_with_exception(request)