Skip to content

Commit ce8462b

Browse files
authored
Merge branch 'main' into feature/shard_ref_count
2 parents 4761a2e + c3255ad commit ce8462b

File tree

3 files changed

+3
-19
lines changed

3 files changed

+3
-19
lines changed

modules/repository-s3/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,6 @@ esplugin.bundleSpec.from('config/repository-s3') {
124124
into 'config'
125125
}
126126

127-
tasks.named("internalClusterTest").configure {
128-
// TODO: remove once https://github.com/elastic/elasticsearch/issues/101608 is fixed
129-
systemProperty 'es.insecure_network_trace_enabled', 'true'
130-
}
131-
132127
tasks.named("thirdPartyAudit").configure {
133128
ignoreMissingClasses(
134129
// missing/unused classes

modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import org.elasticsearch.test.BackgroundIndexer;
6666
import org.elasticsearch.test.ESIntegTestCase;
6767
import org.elasticsearch.test.MockLog;
68-
import org.elasticsearch.test.junit.annotations.TestIssueLogging;
6968
import org.elasticsearch.threadpool.ThreadPool;
7069
import org.elasticsearch.xcontent.NamedXContentRegistry;
7170
import org.elasticsearch.xcontent.XContentFactory;
@@ -181,15 +180,6 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
181180
return builder.build();
182181
}
183182

184-
@Override
185-
@TestIssueLogging(
186-
issueUrl = "https://github.com/elastic/elasticsearch/issues/88841",
187-
value = "com.amazonaws.request:DEBUG,com.amazonaws.http.AmazonHttpClient:TRACE"
188-
)
189-
public void testRequestStats() throws Exception {
190-
super.testRequestStats();
191-
}
192-
193183
public void testAbortRequestStats() throws Exception {
194184
final String repository = createRepository(randomRepositoryName(), false);
195185

@@ -233,10 +223,6 @@ public void testAbortRequestStats() throws Exception {
233223
assertEquals(assertionErrorMsg, mockCalls, sdkRequestCounts);
234224
}
235225

236-
@TestIssueLogging(
237-
issueUrl = "https://github.com/elastic/elasticsearch/issues/101608",
238-
value = "com.amazonaws.request:DEBUG,com.amazonaws.http.AmazonHttpClient:TRACE"
239-
)
240226
public void testMetrics() throws Exception {
241227
// Create the repository and perform some activities
242228
final String repository = createRepository(randomRepositoryName(), false);

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,9 @@ tests:
568568
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapperTests
569569
method: testExistsQueryMinimalMapping
570570
issue: https://github.com/elastic/elasticsearch/issues/129911
571+
- class: org.elasticsearch.index.mapper.DynamicMappingIT
572+
method: testDenseVectorDynamicMapping
573+
issue: https://github.com/elastic/elasticsearch/issues/129928
571574

572575
# Examples:
573576
#

0 commit comments

Comments
 (0)