[Fixbug]: Fix delete default HFT configuration issue (#4025)

Pterosaur · web-flow · commit b75c13dee6df · 2025-12-08T09:07:11.000-08:00
What I did
This PR is for fixing a bug that telemetry_tam object may not be deleted after the default HFT profile removed.

Why I did it
To the default profile, its group is empty, so the original checker isEmpty will be unable to capture the group deletion message.
diff --git a/orchagent/high_frequency_telemetry/hftelorch.cpp b/orchagent/high_frequency_telemetry/hftelorch.cpp
@@ -228,7 +228,7 @@ task_process_status HFTelOrch::profileTableDel(const std::string &profile_name)
         return task_process_status::task_need_retry;
     }
 
-    if (!profile_itr->second->isEmpty())
+    if (!profile_itr->second->isEmpty() || isProfileInUse(profile_itr->second))
     {
         return task_process_status::task_need_retry;
     }
@@ -355,6 +355,21 @@ std::shared_ptr<HFTelProfile> HFTelOrch::tryGetProfile(const std::string &profil
     return std::shared_ptr<HFTelProfile>();
 }
 
+bool HFTelOrch::isProfileInUse(const std::shared_ptr<HFTelProfile> &profile) const
+{
+    SWSS_LOG_ENTER();
+
+    for (const auto &type_profiles : m_type_profile_mapping)
+    {
+        if (type_profiles.second.find(profile) != type_profiles.second.end())
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 void HFTelOrch::doTask(swss::NotificationConsumer &consumer)
 {
     SWSS_LOG_ENTER();
diff --git a/orchagent/high_frequency_telemetry/hftelorch.h b/orchagent/high_frequency_telemetry/hftelorch.h
@@ -46,6 +46,7 @@ class HFTelOrch : public Orch
     task_process_status groupTableDel(const std::string &profile_name, const std::string &group_name);
     std::shared_ptr<HFTelProfile> getProfile(const std::string &profile_name);
     std::shared_ptr<HFTelProfile> tryGetProfile(const std::string &profile_name);
+    bool isProfileInUse(const std::shared_ptr<HFTelProfile> &profile) const;
 
     void doTask(swss::NotificationConsumer &consumer);
     void doTask(Consumer &consumer);
diff --git a/tests/test_hft.py b/tests/test_hft.py
@@ -514,6 +514,45 @@ def test_hft_multiple_groups(self, dvs, testlog):
         # Clean up profile
         self.delete_hft_profile(dvs)
 
+    def test_hft_empty_default_config_cleanup(self, dvs, testlog):
+        """Test that TAM_TELEMETRY objects are properly cleaned up when deleting 
+        a default HFT profile with empty object_names and object_counters."""  
+        # Create default HFT profile
+        self.create_hft_profile(dvs, name="default", status="enabled")
+        
+        # Create HFT group with empty object_names and object_counters
+        self.create_hft_group(dvs,
+                              profile_name="default",
+                              group_name="PORT",
+                              object_names="",
+                              object_counters="")
+
+        # Wait for processing
+        time.sleep(3)
+
+        # Get ASIC DB objects and verify TAM_TELEMETRY exists
+        asic_db = self.get_asic_db_objects(dvs)
+        assert len(asic_db["tam_telemetry"]) > 0, \
+            "Expected TAM_TELEMETRY object to exist before deletion"
+
+        # Delete profile first
+        self.delete_hft_profile(dvs, name="default")
+        
+        # Sleep for 1 second
+        time.sleep(1)
+        
+        # Delete group
+        self.delete_hft_group(dvs, profile_name="default", group_name="PORT")
+
+        # Wait for cleanup
+        time.sleep(2)
+
+        # Verify TAM_TELEMETRY object is deleted
+        asic_db = self.get_asic_db_objects(dvs)
+        assert len(asic_db["tam_telemetry"]) == 0, \
+            "Expected TAM_TELEMETRY object to be deleted after profile and group deletion"
+
+
 # Add Dummy always-pass test at end as workaroud
 # for issue when Flaky fail on final test it invokes module tear-down before retrying
 def test_nonflaky_dummy():

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ task_process_status HFTelOrch::profileTableDel(const std::string &profile_name)`
`228`	`228`	`return task_process_status::task_need_retry;`
`229`	`229`	`}`
`230`	`230`
`231`		`- if (!profile_itr->second->isEmpty())`
	`231`	`+ if (!profile_itr->second->isEmpty() \|\| isProfileInUse(profile_itr->second))`
`232`	`232`	`{`
`233`	`233`	`return task_process_status::task_need_retry;`
`234`	`234`	`}`
`@@ -355,6 +355,21 @@ std::shared_ptr<HFTelProfile> HFTelOrch::tryGetProfile(const std::string &profil`
`355`	`355`	`return std::shared_ptr<HFTelProfile>();`
`356`	`356`	`}`
`357`	`357`
	`358`	`+bool HFTelOrch::isProfileInUse(const std::shared_ptr<HFTelProfile> &profile) const`
	`359`	`+{`
	`360`	`+ SWSS_LOG_ENTER();`
	`361`	`+`
	`362`	`+ for (const auto &type_profiles : m_type_profile_mapping)`
	`363`	`+ {`
	`364`	`+ if (type_profiles.second.find(profile) != type_profiles.second.end())`
	`365`	`+ {`
	`366`	`+ return true;`
	`367`	`+ }`
	`368`	`+ }`
	`369`	`+`
	`370`	`+ return false;`
	`371`	`+}`
	`372`	`+`
`358`	`373`	`void HFTelOrch::doTask(swss::NotificationConsumer &consumer)`
`359`	`374`	`{`
`360`	`375`	`SWSS_LOG_ENTER();`