Merge pull request #562 from ddps-lab/azure-collector-fix

Azure collector 구독 관리 모듈 개선

Author: krtaiyang

collector/spot-dataset/azure/lambda/current_collector/load_sps.py

@@ -201,7 +201,6 @@ def execute_spot_placement_score_task_by_parameter_pool_df(api_calls_df, desired
                     result = future.result()
                     desired_count = future_to_desired_count[future]
                     if result and result != "NO_AVAILABLE_LOCATIONS":
-                        SS_Resources.succeed_to_get_sps_count += 1
                         for score in result["placementScores"]:
                             score_data = {
                                 "DesiredCount": desired_count,
@@ -292,8 +291,8 @@ def execute_spot_placement_score_api(region_chunk, instance_type_chunk, desired_
         }
         try:
             response = requests.post(url, headers=headers, json=request_body, timeout=50)
-            SL_Manager.update_call_history(subscription_id, location)
             response.raise_for_status()
+            SS_Resources.succeed_to_get_sps_count += 1
             return response.json()
 
         except requests.exceptions.Timeout:

collector/spot-dataset/azure/lambda/current_collector/sps_module/sps_location_manager.py

@@ -52,17 +52,17 @@ def check_and_add_available_locations(az):
         return False
 
 
-def validation_can_call(location, history, over_limit_locations):
+def validation_can_call(subscription_id, location):
     """
     이 메서드는 지정된 location으로 호출 가능한지 확인합니다.
     초과 요청 여부와 호출 이력의 크기를 기준으로 판단합니다.
     """
-    if over_limit_locations:
-        if ((location not in over_limit_locations)
-                and (len(history[location]) < 10)):
+    if SS_Resources.locations_over_limit_tmp.get(subscription_id):
+        if ((location not in SS_Resources.locations_over_limit_tmp.get(subscription_id))
+                and (len(SS_Resources.locations_call_history_tmp[subscription_id][location]) < 10)):
             return True
     else:
-        if len(history[location]) < 10:
+        if len(SS_Resources.locations_call_history_tmp[subscription_id][location]) < 10:
             return True
     return False
 
@@ -105,8 +105,9 @@ def get_next_available_location():
                 SS_Resources.last_subscription_id_and_location_tmp['last_subscription_id'] = subscription_id
                 SS_Resources.last_subscription_id_and_location_tmp['last_location'] = location
 
-                if validation_can_call(location, SS_Resources.locations_call_history_tmp[subscription_id], SS_Resources.locations_over_limit_tmp.get(subscription_id)):
+                if validation_can_call(subscription_id, location):
                     SS_Resources.succeed_to_get_next_available_location_count += 1
+                    update_call_history(subscription_id, location)
                     return subscription_id, location
 
         return None