Skip to content

Commit e17e766

Browse files
authored
Merge pull request quarkusio#35366 from yrodiere/elasticsearch-timeout
Address Elasticsearch-related integration test failures caused by timeouts
2 parents 59da325 + bbccb84 commit e17e766

File tree

11 files changed

+114
-3
lines changed

11 files changed

+114
-3
lines changed

extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,16 @@
128128
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
129129
-->
130130
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
131+
<!-- Disable some features that are not needed in our tests and just slow down startup -->
132+
<xpack.profiling.enabled>false</xpack.profiling.enabled>
133+
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
134+
<xpack.ml.enabled>false</xpack.ml.enabled>
135+
<xpack.watcher.enabled>false</xpack.watcher.enabled>
136+
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
137+
<stack.templates.enabled>false</stack.templates.enabled>
138+
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
139+
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
140+
<slm.history_index_enabled>false</slm.history_index_enabled>
131141
</env>
132142
<ports>
133143
<port>9200:9200</port>

extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,16 @@
133133
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
134134
-->
135135
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
136+
<!-- Disable some features that are not needed in our tests and just slow down startup -->
137+
<xpack.profiling.enabled>false</xpack.profiling.enabled>
138+
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
139+
<xpack.ml.enabled>false</xpack.ml.enabled>
140+
<xpack.watcher.enabled>false</xpack.watcher.enabled>
141+
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
142+
<stack.templates.enabled>false</stack.templates.enabled>
143+
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
144+
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
145+
<slm.history_index_enabled>false</slm.history_index_enabled>
136146
</env>
137147
<ports>
138148
<port>9200:9200</port>

integration-tests/elasticsearch-java-client/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,16 @@
173173
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
174174
-->
175175
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
176+
<!-- Disable some features that are not needed in our tests and just slow down startup -->
177+
<xpack.profiling.enabled>false</xpack.profiling.enabled>
178+
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
179+
<xpack.ml.enabled>false</xpack.ml.enabled>
180+
<xpack.watcher.enabled>false</xpack.watcher.enabled>
181+
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
182+
<stack.templates.enabled>false</stack.templates.enabled>
183+
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
184+
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
185+
<slm.history_index_enabled>false</slm.history_index_enabled>
176186
</env>
177187
<ports>
178188
<port>9200:9200</port>
@@ -188,7 +198,7 @@
188198
<method>GET</method>
189199
<status>200</status>
190200
</http>
191-
<time>20000</time>
201+
<time>30000</time>
192202
</wait>
193203
</run>
194204
</image>

integration-tests/elasticsearch-rest-client/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,16 @@
173173
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
174174
-->
175175
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
176+
<!-- Disable some features that are not needed in our tests and just slow down startup -->
177+
<xpack.profiling.enabled>false</xpack.profiling.enabled>
178+
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
179+
<xpack.ml.enabled>false</xpack.ml.enabled>
180+
<xpack.watcher.enabled>false</xpack.watcher.enabled>
181+
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
182+
<stack.templates.enabled>false</stack.templates.enabled>
183+
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
184+
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
185+
<slm.history_index_enabled>false</slm.history_index_enabled>
176186
</env>
177187
<ports>
178188
<port>9200:9200</port>

integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,18 @@
213213
and lead to problems on large disks with little space left.
214214
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
215215
-->
216-
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled> </env>
216+
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
217+
<!-- Disable some features that are not needed in our tests and just slow down startup -->
218+
<xpack.profiling.enabled>false</xpack.profiling.enabled>
219+
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
220+
<xpack.ml.enabled>false</xpack.ml.enabled>
221+
<xpack.watcher.enabled>false</xpack.watcher.enabled>
222+
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
223+
<stack.templates.enabled>false</stack.templates.enabled>
224+
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
225+
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
226+
<slm.history_index_enabled>false</slm.history_index_enabled>
227+
</env>
217228
<ports>
218229
<port>9200:9200</port>
219230
</ports>

integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,16 @@
230230
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
231231
-->
232232
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
233+
<!-- Disable some features that are not needed in our tests and just slow down startup -->
234+
<xpack.profiling.enabled>false</xpack.profiling.enabled>
235+
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
236+
<xpack.ml.enabled>false</xpack.ml.enabled>
237+
<xpack.watcher.enabled>false</xpack.watcher.enabled>
238+
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
239+
<stack.templates.enabled>false</stack.templates.enabled>
240+
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
241+
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
242+
<slm.history_index_enabled>false</slm.history_index_enabled>
233243
</env>
234244
<ports>
235245
<port>9200:9200</port>

integration-tests/hibernate-search-orm-elasticsearch/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,16 @@
192192
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
193193
-->
194194
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
195+
<!-- Disable some features that are not needed in our tests and just slow down startup -->
196+
<xpack.profiling.enabled>false</xpack.profiling.enabled>
197+
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
198+
<xpack.ml.enabled>false</xpack.ml.enabled>
199+
<xpack.watcher.enabled>false</xpack.watcher.enabled>
200+
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
201+
<stack.templates.enabled>false</stack.templates.enabled>
202+
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
203+
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
204+
<slm.history_index_enabled>false</slm.history_index_enabled>
195205
</env>
196206
<ports>
197207
<port>9200:9200</port>

integration-tests/logging-gelf/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@
165165
See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation
166166
-->
167167
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
168+
<!-- Disable some features that are not needed in our tests and just slow down startup -->
169+
<xpack.profiling.enabled>false</xpack.profiling.enabled>
170+
<xpack.monitoring.templates.enabled>false</xpack.monitoring.templates.enabled>
171+
<xpack.ml.enabled>false</xpack.ml.enabled>
172+
<xpack.watcher.enabled>false</xpack.watcher.enabled>
173+
<xpack.ent_search.enabled>false</xpack.ent_search.enabled>
174+
<stack.templates.enabled>false</stack.templates.enabled>
175+
<cluster.deprecation_indexing.enabled>false</cluster.deprecation_indexing.enabled>
176+
<indices.lifecycle.history_index_enabled>false</indices.lifecycle.history_index_enabled>
177+
<slm.history_index_enabled>false</slm.history_index_enabled>
168178
</env>
169179
<log>
170180
<prefix>Elasticsearch:</prefix>

integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,17 @@ services:
77
ES_JAVA_OPTS: "-Xms512m -Xmx512m"
88
discovery.type: "single-node"
99
xpack.security.enabled: "false"
10-
cluster.routing.allocation.disk.threshold_enabled: false
10+
cluster.routing.allocation.disk.threshold_enabled: "false"
11+
# Disable some features that are not needed in our tests and just slow down startup -->
12+
xpack.profiling.enabled: "false"
13+
xpack.monitoring.templates.enabled: "false"
14+
xpack.ml.enabled: "false"
15+
xpack.watcher.enabled: "false"
16+
xpack.ent_search.enabled: "false"
17+
stack.templates.enabled: "false"
18+
cluster.deprecation_indexing.enabled: "false"
19+
indices.lifecycle.history_index_enabled: "false"
20+
slm.history_index_enabled: "false"
1121
networks:
1222
- efk
1323

integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ services:
88
discovery.type: "single-node"
99
xpack.security.enabled: "false"
1010
cluster.routing.allocation.disk.threshold_enabled: false
11+
# Disable some features that are not needed in our tests and just slow down startup -->
12+
xpack.profiling.enabled: "false"
13+
xpack.monitoring.templates.enabled: "false"
14+
xpack.ml.enabled: "false"
15+
xpack.watcher.enabled: "false"
16+
xpack.ent_search.enabled: "false"
17+
stack.templates.enabled: "false"
18+
cluster.deprecation_indexing.enabled: "false"
19+
indices.lifecycle.history_index_enabled: "false"
20+
slm.history_index_enabled: "false"
1121
networks:
1222
- elk
1323

integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ services:
88
discovery.type: "single-node"
99
xpack.security.enabled: "false"
1010
cluster.routing.allocation.disk.threshold_enabled: false
11+
# Disable some features that are not needed in our tests and just slow down startup -->
12+
xpack.profiling.enabled: "false"
13+
xpack.monitoring.templates.enabled: "false"
14+
xpack.ml.enabled: "false"
15+
xpack.watcher.enabled: "false"
16+
xpack.ent_search.enabled: "false"
17+
stack.templates.enabled: "false"
18+
cluster.deprecation_indexing.enabled: "false"
19+
indices.lifecycle.history_index_enabled: "false"
20+
slm.history_index_enabled: "false"
1121
networks:
1222
- graylog
1323

0 commit comments

Comments
 (0)