Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

fix wrong framework retry records #4915

Merged
merged 3 commits into from
Sep 21, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/fluentd/deploy/fluentd-config.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,24 @@ data:
</record>
</filter>

# add logType
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logType [](start = 10, length = 7)

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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down