issue-5702 - Duplicate mapping route | ENVOY CONFIG MISMATCH issue fixed

Signed-off-by: Sekar Saravanan <[email protected]>

Author: sekar-saravanan

CHANGELOG.md

@@ -103,6 +103,13 @@ it will be removed; but as it won't be user-visible this isn't considered a brea
 - Change: Upgraded Emissary-ingress to the latest release of Golang as part of our general
   dependency upgrade process.
 
+- Bugfix: Emissary creating duplicate mapping in ir.json and econf.json while adding weight for canary 
+  release. This leads to getting IR MISMATCH & ENVOY CONFIG MISMATCH error frequently in the logs and 
+  also consumes more cpu. We have introduced a condition that, it will add the mapping only if the mapping
+  is not already present in the group.
+
+[#5702]: https://github.com/emissary-ingress/emissary/issues/5702
+
 ## [3.9.0] November 13, 2023
 [3.9.0]: https://github.com/emissary-ingress/emissary/compare/v3.8.0...v3.9.0
 

python/ambassador/ir/ir.py

@@ -1008,7 +1008,10 @@ def add_mapping(self, aconf: Config, mapping: IRBaseMapping) -> Optional[IRBaseM
             else:
                 self.logger.debug(f"IR: already have group for {mapping.name}")
                 group = self.groups[mapping.group_id]
-                group.add_mapping(aconf, mapping)
+                existing_mapping_cache_keys = [ group_mapping["_cache_key"] for group_mapping in group["mappings"] ]
+                if mapping["_cache_key"] not in existing_mapping_cache_keys:
+                    self.logger.debug(f"IR: mapping {mapping.name} is not exists. adding it into the group.")
+                    group.add_mapping(aconf, mapping)
 
             self.cache_add(mapping)
             self.cache_add(group)

python/ambassador_diag/diagd.py

@@ -550,7 +550,7 @@ def check_cache(self) -> bool:
             result = False
             self.logger.error("CACHE: ENVOY CONFIG MISMATCH")
             errors += "econf diffs:\n"
-            errors += self.json_diff("econf", i1, i2)
+            errors += self.json_diff("econf", e1, e2)
 
         if not result:
             err_path = os.path.join(self.snapshot_path, "diff-tmp.txt")