Skip to content

Commit 894dbc7

Browse files
author
Hendrik Muhs
authored
[Transform] fix intermittent test_usage failure (#65742)
relax test for trigger count, it might have been incremented but not persisted fixes #52931
1 parent 95fda0a commit 894dbc7

File tree

1 file changed

+4
-6
lines changed
  • x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration

1 file changed

+4
-6
lines changed

x-pack/plugin/transform/qa/single-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TransformUsageIT.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ public void testUsage() throws Exception {
7575

7676
Request getRequest = new Request("GET", getTransformEndpoint() + "test_usage/_stats");
7777
Map<String, Object> stats = entityAsMap(client().performRequest(getRequest));
78-
// temporary debug logs for https://github.com/elastic/elasticsearch/issues/52931
79-
logger.info("test_usage/_stats response: [{}]", stats);
8078
Map<String, Double> expectedStats = new HashMap<>();
8179
for (String statName : PROVIDED_STATS) {
8280
@SuppressWarnings("unchecked")
@@ -87,8 +85,6 @@ public void testUsage() throws Exception {
8785

8886
getRequest = new Request("GET", getTransformEndpoint() + "test_usage_continuous/_stats");
8987
stats = entityAsMap(client().performRequest(getRequest));
90-
// temporary debug logs for https://github.com/elastic/elasticsearch/issues/52931
91-
logger.info("test_usage_continuous/_stats response: [{}]", stats);
9288
for (String statName : PROVIDED_STATS) {
9389
@SuppressWarnings("unchecked")
9490
List<Object> specificStatistic = (List<Object>) (XContentMapValues.extractValue("transforms.stats." + statName, stats));
@@ -107,12 +103,14 @@ public void testUsage() throws Exception {
107103
assertEquals(2, XContentMapValues.extractValue("transform.transforms.stopped", statsMap));
108104
assertEquals(1, XContentMapValues.extractValue("transform.transforms.started", statsMap));
109105
for (String statName : PROVIDED_STATS) {
110-
// the trigger count can be higher if the scheduler kicked before usage has been called, therefore check for gte
106+
// the trigger count can be off: e.g. if the scheduler kicked in before usage has been called,
107+
// or if the scheduler triggered later, but state hasn't been persisted (by design)
108+
// however, we know that as we have 2 transforms, the trigger count must be greater or equal to 2
111109
if (statName.equals(TransformIndexerStats.NUM_INVOCATIONS.getPreferredName())) {
112110
assertThat(
113111
"Incorrect stat " + statName + ", got: " + statsMap.get("transform"),
114112
extractStatsAsDouble(XContentMapValues.extractValue("transform.stats." + statName, statsMap)),
115-
greaterThanOrEqualTo(expectedStats.get(statName).doubleValue())
113+
greaterThanOrEqualTo(2.0)
116114
);
117115
} else {
118116
assertThat(

0 commit comments

Comments
 (0)