Skip to content

Improve null statistics handling in product tests #10516

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
findepi merged 2 commits into from
Jan 13, 2022
Merged

Improve null statistics handling in product tests #10516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bad3c4d
Improve null statistics handling in product tests
wendigo Jan 10, 2022
af206cd
Remove peak memory usage statistic
wendigo Jan 10, 2022
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
32 changes: 17 additions & 15 deletions ...t-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/StatisticsFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package io.trino.tests.product.launcher.env;

import com.github.dockerjava.api.async.ResultCallback;
import com.github.dockerjava.api.model.CpuUsageConfig;
import com.github.dockerjava.api.model.MemoryStatsConfig;
import com.github.dockerjava.api.model.StatisticNetworksConfig;
import com.github.dockerjava.api.model.Statistics;
Expand All @@ -24,14 +25,20 @@
import java.io.Closeable;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
import java.util.stream.Stream;

import static com.google.common.base.MoreObjects.firstNonNull;
import static io.airlift.units.DataSize.Unit.GIGABYTE;
import static io.trino.tests.product.launcher.env.StatisticsFetcher.Stats.statisticsAreEmpty;
import static java.lang.String.format;
import static java.util.Collections.emptyList;
import static java.util.Objects.requireNonNull;

public class StatisticsFetcher
Expand Down Expand Up @@ -90,30 +97,28 @@ private Stats toStats(Statistics statistics, Stats previousStats)
}

Stats stats = new Stats();
stats.systemCpuUsage = statistics.getCpuStats().getSystemCpuUsage();
stats.totalCpuUsage = statistics.getCpuStats().getCpuUsage().getTotalUsage();
stats.systemCpuUsage = firstNonNull(statistics.getCpuStats().getSystemCpuUsage(), -1L);
stats.totalCpuUsage = Optional.ofNullable(statistics.getCpuStats().getCpuUsage()).map(CpuUsageConfig::getTotalUsage).orElse(-1L);
Comment thread
wendigo marked this conversation as resolved.
Outdated
stats.cpuUsagePerc = 0.0;

if (previousStats.systemCpuUsage != -1 && previousStats.totalCpuUsage != -1) {
double usageCpuDelta = stats.totalCpuUsage - previousStats.totalCpuUsage;
double systemCpuDelta = stats.systemCpuUsage - previousStats.systemCpuUsage;

if (usageCpuDelta > 0.0 && systemCpuDelta > 0.0) {
stats.cpuUsagePerc = usageCpuDelta / systemCpuDelta * statistics.getCpuStats().getCpuUsage().getPercpuUsage().size() * 100;
stats.cpuUsagePerc = usageCpuDelta / systemCpuDelta * Optional.ofNullable(statistics.getCpuStats().getCpuUsage().getPercpuUsage()).map(List::size).orElse(1) * 100;
}
}

MemoryStatsConfig memoryStats = statistics.getMemoryStats();
stats.memoryLimit = DataSize.ofBytes(memoryStats.getLimit()).to(GIGABYTE);
stats.memoryUsage = DataSize.ofBytes(memoryStats.getUsage()).to(GIGABYTE);
stats.memoryMaxUsage = DataSize.ofBytes(memoryStats.getMaxUsage()).to(GIGABYTE);
stats.memoryUsagePerc = 100.0 * memoryStats.getUsage() / memoryStats.getLimit();
stats.memoryLimit = DataSize.ofBytes(firstNonNull(memoryStats.getLimit(), 0L)).to(GIGABYTE);
stats.memoryUsage = DataSize.ofBytes(firstNonNull(memoryStats.getUsage(), 0L)).to(GIGABYTE);
stats.memoryUsagePerc = 100.0 * firstNonNull(memoryStats.getUsage(), 0L) / firstNonNull(memoryStats.getLimit(), 1L);
stats.pids = firstNonNull(statistics.getPidsStats().getCurrent(), -1L);

stats.pids = statistics.getPidsStats().getCurrent();

Supplier<Stream<StatisticNetworksConfig>> stream = () -> statistics.getNetworks().values().stream();
stats.networkReceived = DataSize.ofBytes(stream.get().map(StatisticNetworksConfig::getRxBytes).reduce(0L, Long::sum)).succinct();
stats.networkSent = DataSize.ofBytes(stream.get().map(StatisticNetworksConfig::getTxBytes).reduce(0L, Long::sum)).succinct();
Supplier<Stream<StatisticNetworksConfig>> stream = () -> Optional.ofNullable(statistics.getNetworks()).map(Map::values).orElse(emptyList()).stream();
stats.networkReceived = DataSize.ofBytes(stream.get().map(StatisticNetworksConfig::getRxBytes).filter(Objects::nonNull).reduce(0L, Long::sum)).succinct();
stats.networkSent = DataSize.ofBytes(stream.get().map(StatisticNetworksConfig::getTxBytes).filter(Objects::nonNull).reduce(0L, Long::sum)).succinct();

return stats;
}
Expand Down Expand Up @@ -184,7 +189,6 @@ public static class Stats
"mem",
"max mem",
"mem %",
"peak mem",
Comment thread
wendigo marked this conversation as resolved.
Outdated
"pids",
"net in",
"net out"
Expand All @@ -196,7 +200,6 @@ public static class Stats
private double memoryUsagePerc;
private DataSize memoryUsage;
private DataSize memoryLimit;
private DataSize memoryMaxUsage;
private long pids;
public DataSize networkReceived;
public DataSize networkSent;
Expand All @@ -218,7 +221,6 @@ public String[] toRow(String name)
memoryLimit.toString(),
memoryUsage.toString(),
format("%.2f%%", memoryUsagePerc),
memoryMaxUsage.toString(),
format("%d", pids),
format("%s", networkReceived),
format("%s", networkSent)
Expand Down