Skip to content

Fix duplicate records in container memory/cpu samples #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
r-dilip merged 1 commit into from
Nov 12, 2019
Merged

Fix duplicate records in container memory/cpu samples #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions source/code/plugin/filter_health_model_builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,11 @@ def filter_stream(tag, es)
}
end
container_records_aggregator = HealthContainerCpuMemoryAggregator.new(@resources, @provider)
deduped_records = container_records_aggregator.dedupe_records(container_records)
if @container_cpu_memory_records.nil?
@log.info "@container_cpu_memory_records was not initialized"
@container_cpu_memory_records = [] #in some clusters, this is null, so initialize it again.
end
@container_cpu_memory_records.push(*deduped_records) # push the records for aggregation later
@container_cpu_memory_records.push(*container_records) # push the records for aggregation later
return MultiEventStream.new
elsif tag.start_with?("kubehealth.ReplicaSet")
records = []
Expand All @@ -114,7 +113,8 @@ def filter_stream(tag, es)
aggregated_container_records = []
if !@container_cpu_memory_records.nil? && !@container_cpu_memory_records.empty?
container_records_aggregator = HealthContainerCpuMemoryAggregator.new(@resources, @provider)
container_records_aggregator.aggregate(@container_cpu_memory_records)
deduped_records = container_records_aggregator.dedupe_records(@container_cpu_memory_records)
container_records_aggregator.aggregate(deduped_records)
container_records_aggregator.compute_state
aggregated_container_records = container_records_aggregator.get_records
end
Expand Down
3 changes: 2 additions & 1 deletion source/code/plugin/health/health_container_cpu_memory_aggregator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,13 @@ def dedupe_records(container_records)
else
r = resource_instances[instance_name]
if record["Timestamp"] > r["Timestamp"]
@log.info "Dropping older record"
@log.info "Dropping older record for instance #{instance_name} new: #{record["Timestamp"]} old: #{r["Timestamp"]}"
resource_instances[instance_name] = record
end
end
rescue => e
@log.info "Exception when deduping record #{record}"
next
end
end
return cpu_deduped_instances.values.concat(memory_deduped_instances.values)
Expand Down