fix wrong framework retry records (#4915)

* fix fix fix fix fix fix fix fix * fix * fix
microsoft · Sep 21, 2020 · f5552de · f5552de
1 parent 71e3e5e
commit f5552de
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/fluentd/deploy/fluentd-config.yaml.template b/src/fluentd/deploy/fluentd-config.yaml.template
@@ -94,6 +94,24 @@ data:
       </record>
     </filter>
 
+    # add objectSnapshotTrigger
+    <filter fc-objectsnapshots>
+      @type record_transformer
+      enable_ruby
+      <record>
+        objectSnapshotTrigger "${\
+          if record['logMessage'].include? 'Framework Pod Deleted'
+            'pod_deleted'
+          elsif record['logMessage'].include? 'Framework will be retried'
+            'framework_retried'
+          elsif record['logMessage'].include? 'Task will be retried'
+            'task_retried'
+          else
+            'unknown'
+          end}"
+      </record>
+    </filter>
+
     # Remove useless keys
     <filter fc-objectsnapshots>
       @type record_transformer

diff --git a/src/fluentd/src/fluent-plugin-pgjson/lib/fluent/plugin/out_pgjson.rb b/src/fluentd/src/fluent-plugin-pgjson/lib/fluent/plugin/out_pgjson.rb
@@ -207,11 +207,15 @@ def write(chunk)
         begin
           chunk.msgpack_each do |time, record|
             kind = record["objectSnapshot"]["kind"]
-            log.info "[pgjson] object type #{kind} in chunk #{hex_id}"
-            if kind == "Framework"
+            trigger = record['objectSnapshotTrigger']
+            log.info "[pgjson] object type #{kind} triggered by #{trigger} found in chunk #{hex_id}"
+            if trigger == "framework_retried" && kind == "Framework"
               insert_framework hex_id, time, record
-            elsif kind == "Pod"
+            elsif trigger == "pod_deleted" && kind == "Pod"
               insert_pod hex_id, time, record
+            else
+              logMessage = record['logMessage']
+              log.info "[pgjson] object type #{kind} triggered by #{trigger} in chunk #{hex_id} ignored. log message: #{logMessage}"
             end
           end
         rescue PG::ConnectionBad, PG::UnableToSend => err