Skip to content

Correctly calculate disk usage for frozen data tier telemetry #86580

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
merged 3 commits into from
May 12, 2022
Merged

Correctly calculate disk usage for frozen data tier telemetry #86580

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
892fde4
Correctly calculate disk usage for frozen data tier telemetry
dakrone May 9, 2022
9676759
Update docs/changelog/86580.yaml
dakrone May 9, 2022
99b588c
Merge branch 'master' into use-total-data-set-for-tier-telemetry
elasticmachine May 12, 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
6 changes: 6 additions & 0 deletions docs/changelog/86580.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 86580
summary: Correctly calculate disk usage for frozen data tier telemetry
area: Stats
type: bug
issues:
- 86055
4 changes: 2 additions & 2 deletions ...plugin/core/src/main/java/org/elasticsearch/xpack/core/DataTiersUsageTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ private static void aggregateDataTierShardStats(NodeStats nodeStats, Index index
final List<IndexShardStats> allShardStats = nodeStats.getIndices().getShardStats(index);
if (allShardStats != null) {
for (IndexShardStats shardStat : allShardStats) {
accumulator.totalByteCount += shardStat.getTotal().getStore().getSizeInBytes();
accumulator.totalByteCount += shardStat.getTotal().getStore().totalDataSetSizeInBytes();
accumulator.docCount += shardStat.getTotal().getDocs().getCount();

// Accumulate stats about started shards
Expand All @@ -215,7 +215,7 @@ private static void aggregateDataTierShardStats(NodeStats nodeStats, Index index
if (primaryStoreStats != null) {
// if primaryStoreStats is null, it means there is no primary on the node in question
accumulator.primaryShardCount++;
long primarySize = primaryStoreStats.getSizeInBytes();
long primarySize = primaryStoreStats.totalDataSetSizeInBytes();
accumulator.primaryByteCount += primarySize;
accumulator.valueSketch.add(primarySize);
}
Expand Down
2 changes: 1 addition & 1 deletion ...n/core/src/test/java/org/elasticsearch/xpack/core/DataTiersUsageTransportActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ private List<NodeStats> buildNodeStats(ClusterState clusterState, long bytesPerS
}

private static ShardStats shardStat(long byteCount, long docCount, ShardRouting routing) {
StoreStats storeStats = new StoreStats(byteCount, 0L, 0L);
StoreStats storeStats = new StoreStats(randomNonNegativeLong(), byteCount, 0L);
DocsStats docsStats = new DocsStats(docCount, 0L, byteCount);

CommonStats commonStats = new CommonStats(CommonStatsFlags.ALL);
Expand Down