Skip to content

Commit

Permalink
[Backport 2.x] Renaming tests to IT in order to not encounter rest ca…
Browse files Browse the repository at this point in the history
…ncellable node client handler failures

Signed-off-by: Bharathwaj G <bharath78910@gmail.com>
  • Loading branch information
bharath-techie committed Jan 10, 2023
1 parent 5d1680e commit 255fcc8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fix backward compatibility for static cluster manager throttling threshold setting ([#5633](https://github.com/opensearch-project/OpenSearch/pull/5633))
- Fix index exclusion behavior in snapshot restore and clone APIs ([#5626](https://github.com/opensearch-project/OpenSearch/pull/5626))
- Fix graph filter error in search ([#5665](https://github.com/opensearch-project/OpenSearch/pull/5665))
- [Test] Renaming PIT tests to IT to fix intermittent test failures ([#5750](https://github.com/opensearch-project/OpenSearch/pull/5750))

### Security

[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.4...2.x
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* compatible open source license.
*/

package org.opensearch.search;
package org.opensearch.search.pit;

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

@Before
public void setupIndex() throws ExecutionException, InterruptedException {
Expand Down Expand Up @@ -306,7 +306,7 @@ public void testtConcurrentDeletes() throws InterruptedException, ExecutionExcep
AtomicInteger numDeleteAcknowledged = new AtomicInteger();
TestThreadPool testThreadPool = null;
try {
testThreadPool = new TestThreadPool(DeletePitMultiNodeTests.class.getName());
testThreadPool = new TestThreadPool(DeletePitMultiNodeIT.class.getName());
List<Runnable> operationThreads = new ArrayList<>();
CountDownLatch countDownLatch = new CountDownLatch(concurrentRuns);
for (int i = 0; i < concurrentRuns; i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* compatible open source license.
*/

package org.opensearch.search;
package org.opensearch.search.pit;

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

@Before
public void setupIndex() throws ExecutionException, InterruptedException {
Expand Down Expand Up @@ -244,7 +244,7 @@ public void testConcurrentCreates() throws InterruptedException {
AtomicInteger numSuccess = new AtomicInteger();
TestThreadPool testThreadPool = null;
try {
testThreadPool = new TestThreadPool(DeletePitMultiNodeTests.class.getName());
testThreadPool = new TestThreadPool(PitMultiNodeIT.class.getName());
List<Runnable> operationThreads = new ArrayList<>();
CountDownLatch countDownLatch = new CountDownLatch(concurrentRuns);
Set<String> createSet = new HashSet<>();
Expand Down Expand Up @@ -286,7 +286,7 @@ public void testConcurrentCreatesWithDeletes() throws InterruptedException, Exec
AtomicInteger numSuccess = new AtomicInteger();
TestThreadPool testThreadPool = null;
try {
testThreadPool = new TestThreadPool(PitMultiNodeTests.class.getName());
testThreadPool = new TestThreadPool(PitMultiNodeIT.class.getName());
int concurrentRuns = randomIntBetween(20, 50);

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

List<Runnable> operationThreads = new ArrayList<>();
Expand Down

0 comments on commit 255fcc8

Please sign in to comment.