Przeglądaj źródła

update /clb_gateway_reduce_with_count

xuekailun 4 miesięcy temu
rodzic
commit
08682cf699
2 zmienionych plików z 8 dodań i 8 usunięć
  1. 3 3
      gateway/clb_gateway_reduce_with_count.py
  2. 5 5
      gateway/clb_utils.py

+ 3 - 3
gateway/clb_gateway_reduce_with_count.py

@@ -18,14 +18,14 @@ def remove_instances(ecs_client, clb_client, instance_ids):
     :return: None
     """
     # 1. 摘流量
-    clb_utils.set_instance_weight_process_with_slbs(client=clb_client,
+    clb_utils.set_instance_weight_process_with_clbs(client=clb_client,
                                                 clb_id_list=gateway_config.clb_id_list,
                                                 instance_id_list=instance_ids,
                                                 weight_list=[(0, 20)])
     logging.info(f"set weight = 0 finished, instances: {instance_ids}")
     time.sleep(10)
     # 2.移除slb
-    clb_utils.remove_backend_servers_with_slbs(client=clb_client,
+    clb_utils.remove_backend_servers_with_clbs(client=clb_client,
                                            clb_id_list=gateway_config.clb_id_list,
                                            instances=instance_ids)
     # 3. 停止机器
@@ -74,7 +74,7 @@ def main():
         reduce_count = int(sys.argv[1])
         logging.info(f"reduce instances count: {reduce_count}")
 
-        # 获取slb下所有机器
+        # 获取clb下所有机器
         online_instance_ids = clb_utils.get_instance_ids(client=clb_client, clb_id=gateway_config.clb_id_list[0])
         online_instance_count = len(online_instance_ids)
         logging.info(f"online instance count: {online_instance_count}.")

+ 5 - 5
gateway/clb_utils.py

@@ -443,7 +443,7 @@ def remove_backend_servers(client, slb_id, instances):
 def set_instance_weight_process_with_clbs(client, clb_id_list, instance_id_list, weight_list):
     """
     修改服务器的权重值
-    :param client: slb客户端连接
+    :param client: clb客户端连接
     :param clb_id_list: slb id list
     :param instance_id_list: instance id list
     :param weight_list: 权重修改列表 type-list [(weight, sleep_time), ...]
@@ -451,12 +451,12 @@ def set_instance_weight_process_with_clbs(client, clb_id_list, instance_id_list,
     """
     for weight, sleep_time in weight_list:
         logging.info(f"修改权重中: weight = {weight}")
-        for slb_id in clb_id_list:
+        for clb_id in clb_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)
-                    logging.info(f"slb: {slb_id} finished!")
+                    set_weight_for_instances(client=client, slb_id=clb_id, instance_id_list=instance_id_list, weight=weight)
+                    logging.info(f"slb: {clb_id} finished!")
                     flag = False
                 except Exception as e:
                     time.sleep(10)
@@ -494,7 +494,7 @@ def add_backend_servers_with_clbs(client, clb_id_list, instances):
         sys.exit()
 
 
-def remove_backend_servers_with_slbs(client, clb_id_list, instances):
+def remove_backend_servers_with_clbs(client, clb_id_list, instances):
     """
     服务器从负载均衡移除(一次调用最多可以移除20个后端服务器)
     :param client: