Skip to content

Commit 255fcc8

Browse files
[Backport 2.x] Renaming tests to IT in order to not encounter rest cancellable node client handler failures
Signed-off-by: Bharathwaj G <bharath78910@gmail.com>
1 parent 5d1680e commit 255fcc8

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5959
- Fix backward compatibility for static cluster manager throttling threshold setting ([#5633](https://github.com/opensearch-project/OpenSearch/pull/5633))
6060
- Fix index exclusion behavior in snapshot restore and clone APIs ([#5626](https://github.com/opensearch-project/OpenSearch/pull/5626))
6161
- Fix graph filter error in search ([#5665](https://github.com/opensearch-project/OpenSearch/pull/5665))
62+
- [Test] Renaming PIT tests to IT to fix intermittent test failures ([#5750](https://github.com/opensearch-project/OpenSearch/pull/5750))
63+
6264
### Security
6365

6466
[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.4...2.x

server/src/test/java/org/opensearch/search/DeletePitMultiNodeTests.java renamed to server/src/internalClusterTest/java/org/opensearch/search/pit/DeletePitMultiNodeIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.search;
9+
package org.opensearch.search.pit;
1010

1111
import org.junit.After;
1212
import org.junit.Before;
@@ -47,7 +47,7 @@
4747
* Multi node integration tests for delete PIT use cases
4848
*/
4949
@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE, numDataNodes = 2)
50-
public class DeletePitMultiNodeTests extends OpenSearchIntegTestCase {
50+
public class DeletePitMultiNodeIT extends OpenSearchIntegTestCase {
5151

5252
@Before
5353
public void setupIndex() throws ExecutionException, InterruptedException {
@@ -306,7 +306,7 @@ public void testtConcurrentDeletes() throws InterruptedException, ExecutionExcep
306306
AtomicInteger numDeleteAcknowledged = new AtomicInteger();
307307
TestThreadPool testThreadPool = null;
308308
try {
309-
testThreadPool = new TestThreadPool(DeletePitMultiNodeTests.class.getName());
309+
testThreadPool = new TestThreadPool(DeletePitMultiNodeIT.class.getName());
310310
List<Runnable> operationThreads = new ArrayList<>();
311311
CountDownLatch countDownLatch = new CountDownLatch(concurrentRuns);
312312
for (int i = 0; i < concurrentRuns; i++) {

server/src/test/java/org/opensearch/search/PitMultiNodeTests.java renamed to server/src/internalClusterTest/java/org/opensearch/search/pit/PitMultiNodeIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.search;
9+
package org.opensearch.search.pit;
1010

1111
import com.carrotsearch.hppc.cursors.ObjectCursor;
1212
import org.junit.After;
@@ -59,7 +59,7 @@
5959
* Multi node integration tests for PIT creation and search operation with PIT ID.
6060
*/
6161
@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE, numDataNodes = 2)
62-
public class PitMultiNodeTests extends OpenSearchIntegTestCase {
62+
public class PitMultiNodeIT extends OpenSearchIntegTestCase {
6363

6464
@Before
6565
public void setupIndex() throws ExecutionException, InterruptedException {
@@ -244,7 +244,7 @@ public void testConcurrentCreates() throws InterruptedException {
244244
AtomicInteger numSuccess = new AtomicInteger();
245245
TestThreadPool testThreadPool = null;
246246
try {
247-
testThreadPool = new TestThreadPool(DeletePitMultiNodeTests.class.getName());
247+
testThreadPool = new TestThreadPool(PitMultiNodeIT.class.getName());
248248
List<Runnable> operationThreads = new ArrayList<>();
249249
CountDownLatch countDownLatch = new CountDownLatch(concurrentRuns);
250250
Set<String> createSet = new HashSet<>();
@@ -286,7 +286,7 @@ public void testConcurrentCreatesWithDeletes() throws InterruptedException, Exec
286286
AtomicInteger numSuccess = new AtomicInteger();
287287
TestThreadPool testThreadPool = null;
288288
try {
289-
testThreadPool = new TestThreadPool(PitMultiNodeTests.class.getName());
289+
testThreadPool = new TestThreadPool(PitMultiNodeIT.class.getName());
290290
int concurrentRuns = randomIntBetween(20, 50);
291291

292292
List<Runnable> operationThreads = new ArrayList<>();
@@ -425,7 +425,7 @@ public void testConcurrentGetWithDeletes() throws InterruptedException, Executio
425425
AtomicInteger numSuccess = new AtomicInteger();
426426
TestThreadPool testThreadPool = null;
427427
try {
428-
testThreadPool = new TestThreadPool(PitMultiNodeTests.class.getName());
428+
testThreadPool = new TestThreadPool(PitMultiNodeIT.class.getName());
429429
int concurrentRuns = randomIntBetween(20, 50);
430430

431431
List<Runnable> operationThreads = new ArrayList<>();

0 commit comments

Comments
 (0)