liqian преди 2 години
родител
ревизия
a813380c09
променени са 2 файла, в които са добавени 7 реда и са изтрити 6 реда
  1. 6 5
      ess_instance_rov_server.py
  2. 1 1
      rov_server_start.sh

+ 6 - 5
ess_instance_rov_server.py

@@ -70,8 +70,9 @@ async def ess_instance(create_client, slb_client, ess_count, max_workers):
     utils.send_file_to_ecs(client=create_client, instance_id_list=ess_instance_ids, **rov_server_config.start_sh)
     logging.info(f"send start shell file finished, instances: {ess_instance_ids}")
     # 3. 启动服务
+    start_sh_param = "latest"
     server_start_sh = os.path.join(rov_server_config.start_sh['target_dir'], rov_server_config.start_sh['name'])
-    server_start_commend = f"sh {server_start_sh}"
+    server_start_commend = f"sh {server_start_sh} {start_sh_param}"
     utils.run_command(client=create_client, instance_ids=ess_instance_ids, command=server_start_commend)
     # 4. 异步探活
     global health_instances
@@ -90,10 +91,10 @@ async def ess_instance(create_client, slb_client, ess_count, max_workers):
         # 所有机器探活成功
         time.sleep(60)
         add_weight_list = [(10, 30), (20, 20), (40, 10), (60, 10), (80, 10), (100, 10)]
-        utils.set_instance_weight_process(client=slb_client,
-                                          slb_id=rov_server_config.slb_id,
-                                          instance_id_list=ess_instance_ids,
-                                          weight_list=add_weight_list)
+        # utils.set_instance_weight_process(client=slb_client,
+        #                                   slb_id=rov_server_config.slb_id,
+        #                                   instance_id_list=ess_instance_ids,
+        #                                   weight_list=add_weight_list)
         global ess_instances
         ess_instances.extend(ess_instance_ids)
         logging.info(f"ess count: {ess_count}, "

+ 1 - 1
rov_server_start.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 docker login --username=admin --password=Harbor12345 registry.piaoquantv.com
-docker run -d -it --network=host --name=rov-server registry.piaoquantv.com/piaoquan/rov-server:latest
+docker run -d -it --network=host --name=rov-server registry.piaoquantv.com/piaoquan/rov-server:$1