Selaa lähdekoodia

test longvideo_quick_restart

liqian 2 vuotta sitten
vanhempi
commit
125fbadbe3
3 muutettua tiedostoa jossa 8 lisäystä ja 9 poistoa
  1. 6 6
      longvideo_quick_restart.py
  2. 1 2
      rov_server_quick_restart.py
  3. 1 1
      utils.py

+ 6 - 6
longvideo_quick_restart.py

@@ -47,9 +47,9 @@ def restart(slb_client, instance_id, image_name):
     ip_address = utils.get_ip_address(client=slb_client, instance_id=instance_id)
     logging.info(f"ip address:{instance_id}/{ip_address}")
     # 3. 重启容器
-    docker_client = docker.DockerClient(base_url=f'tcp://{ip_address}:2375', timeout=60)
-    image_id = docker_client.containers.get(image_name)
-    image_id.restart()
+    # docker_client = docker.DockerClient(base_url=f'tcp://{ip_address}:2375', timeout=60)
+    # image_id = docker_client.containers.get(image_name)
+    # image_id.restart()
     logging.info(f"docker restart finished, ip address:{instance_id}/{ip_address}")
     time.sleep(5)
     # 4. 探活
@@ -57,7 +57,7 @@ def restart(slb_client, instance_id, image_name):
     logging.info(f"health check finished, ip address:{instance_id}/{ip_address}")
 
 
-def server_restart_all(slb_client, instance_id_list, image_name, max_workers):
+async def server_restart_all(slb_client, instance_id_list, image_name, max_workers):
     try:
         # 1. 摘流量
         utils.set_instance_weight_process_with_slbs(client=slb_client,
@@ -120,8 +120,8 @@ def main():
 
         # 2. 重启
         image_name = 'longvideoapi'
-        server_restart_all(slb_client=slb_client, instance_id_list=online_instance_ids,
-                           image_name=image_name, max_workers=8)
+        asyncio.run(server_restart_all(slb_client=slb_client, instance_id_list=online_instance_ids,
+                                       image_name=image_name, max_workers=8))
         logging.info(f"server restart finished!")
     except Exception as e:
         logging.error(e)

+ 1 - 2
rov_server_quick_restart.py

@@ -120,8 +120,7 @@ def main():
         # 2. 重启
         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=8)
-                    )
+                                       image_name=image_name, max_workers=8))
         logging.info(f"server restart finished!")
     except Exception as e:
         logging.error(e)

+ 1 - 1
utils.py

@@ -407,7 +407,7 @@ def set_instance_weight_process_with_slbs(client, slb_id_list, instance_id_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)
                     logging.info(f"slb: {slb_id} finished!")
                     flag = False
                 except Exception as e: