🐞 fix:TSG-23939: dp-trace-telemetry signal send error by process name need to less than 16 charactersdev-24.12

2 files changed, 7 insertions, 7 deletions

diff --git a/containers/packet-io-engine/templates/mrglobal.conf.j2 b/containers/packet-io-engine/templates/mrglobal.conf.j2
index 60519c58..719e24bd 100644
--- a/containers/packet-io-engine/templates/mrglobal.conf.j2
+++ b/containers/packet-io-engine/templates/mrglobal.conf.j2
@@ -77,7 +77,7 @@ rx_cores={{ interface.rxcore }}
 {% endfor %}
 # Configuration settings for network bonding (bond) functionality.
 {%- for interface in mrzcpd.virtual_interfaces %}
-  {%- if interface.type == 1 %}
+  {%- if interface.type is defined and interface.type == 1 %}
 [device:{{ interface.name }}]
     {%- if interface.address is defined %}
 in_addr={{ interface.address }}
@@ -128,9 +128,9 @@ role=1
 
 # Configuration settings for the representational (represent) device.
 {%- for interface in mrzcpd.virtual_interfaces %}
-  {%- if interface.en_representor == 1 %}
+  {%- if interface.en_representor is defined and interface.en_representor == 1 %}
 [device:{{ interface.name }}]
-    {%- if interface.promisc %}
+    {%- if interface.promisc is defined %}
 promisc={{ interface.promisc }}
     {%- endif %}
     {%- if interface.mtu is defined %}
@@ -288,7 +288,7 @@ nr_max_link_dbs={{ mrzcpd.nr_max_link_dbs | default(0) }}
 sid_start=100
 sid_end=200
 {%- for service in mrzcpd.services %}
-{%- if service.type == "etherfabric_adapter" %}
+{%- if service.type is defined and service.type == "etherfabric_adapter" %}
 [ef_adapter:{{ loop.index0 }}]
 ef_adapter_id={{ service.id }}
 {%- if service.mode == "virtual-wire" %}
@@ -327,7 +327,7 @@ obp_segment={{ virtual_wire.obp_segment }}
 sid_start=500
 sid_end=600
 {%- for service in mrzcpd.services %}
-{%- if service.type == "tera_adapter" %}
+{%- if service.type is defined and service.type == "tera_adapter" %}
 [tera_adapter:{{ loop.index0 }}]
 tera_adapter_id={{ service.id }}
 listen_device={{ service.listen_on_device | default('') }}
@@ -470,4 +470,4 @@ action=2
 priority=0
 sid={{ index * sid_step + 1000 }}
 vwire_id=0
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/helmcharts/dp-trace-telemetry/helm/templates/deployment.yaml b/helmcharts/dp-trace-telemetry/helm/templates/deployment.yaml
index 4bb237be..0bb01f3b 100644
--- a/helmcharts/dp-trace-telemetry/helm/templates/deployment.yaml
+++ b/helmcharts/dp-trace-telemetry/helm/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
             while inotifywait -r -e modify,create "$WATCH_DIR"; do
               echo "send HUB signal to dp_trace"
               /usr/local/bin/j2 -f yaml  /templates/dp_trace_dy.conf.j2 /templates/configmap/values.yaml -o /opt/tsg/dp_trace_telemetry/share_conf/dp_trace_dy.conf
-              pkill -1 dp-trace-telemetry
+              pkill -1 dp_trace_teleme
               echo "signal send"
             done
         volumeMounts: