Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retaining the old constructors for classes marked as API changed as part of #12333 #13926

Merged
merged 4 commits into from
Jun 9, 2024
Merged

Retaining the old constructors for classes marked as API changed as part of #12333 #13926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3028db6
Retaining the old constructors for classes marked as API changed as p…
Jun 2, 2024
5ba6ff9
Refactoring UTs to use the older constructors
Jun 7, 2024
7cd4b3e
Merge branch 'main' into ctorChanges
Jun 8, 2024
06ac829
Adding missing import after merge from main
Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import org.opensearch.common.util.concurrent.PrioritizedOpenSearchThreadPoolExecutor;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
import org.opensearch.telemetry.metrics.noop.NoopMetricsRegistry;
import org.opensearch.telemetry.metrics.tags.Tags;
import org.opensearch.threadpool.Scheduler;
import org.opensearch.threadpool.ThreadPool;
Expand Down Expand Up @@ -125,6 +126,10 @@
private NodeConnectionsService nodeConnectionsService;
private final ClusterManagerMetrics clusterManagerMetrics;

public ClusterApplierService(String nodeName, Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool) {
gargharsh3134 marked this conversation as resolved.
Show resolved Hide resolved
this(nodeName, settings, clusterSettings, threadPool, new ClusterManagerMetrics(NoopMetricsRegistry.INSTANCE));
}

Check warning on line 131 in server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java#L130-L131 

Added lines #L130 - L131 were not covered by tests

public ClusterApplierService(
String nodeName,
Settings settings,
Expand Down
6 changes: 6 additions & 0 deletions server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.opensearch.common.annotation.PublicApi;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.telemetry.metrics.noop.NoopMetricsRegistry;
import org.opensearch.threadpool.ThreadPool;

/**
Expand All @@ -21,6 +22,11 @@
*/
@PublicApi(since = "2.2.0")
public class ClusterManagerService extends MasterService {

public ClusterManagerService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool) {
super(settings, clusterSettings, threadPool, new ClusterManagerMetrics(NoopMetricsRegistry.INSTANCE));
}

Check warning on line 28 in server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java#L27-L28 

Added lines #L27 - L28 were not covered by tests

public ClusterManagerService(
Settings settings,
ClusterSettings clusterSettings,
Expand Down
5 changes: 5 additions & 0 deletions server/src/main/java/org/opensearch/cluster/service/ClusterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.opensearch.common.settings.Settings;
import org.opensearch.index.IndexingPressureService;
import org.opensearch.node.Node;
import org.opensearch.telemetry.metrics.noop.NoopMetricsRegistry;
import org.opensearch.threadpool.ThreadPool;

import java.util.Collections;
Expand Down Expand Up @@ -92,6 +93,10 @@

private IndexingPressureService indexingPressureService;

public ClusterService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool) {
this(settings, clusterSettings, threadPool, new ClusterManagerMetrics(NoopMetricsRegistry.INSTANCE));
}

Check warning on line 98 in server/src/main/java/org/opensearch/cluster/service/ClusterService.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/opensearch/cluster/service/ClusterService.java#L97-L98 

Added lines #L97 - L98 were not covered by tests

public ClusterService(
Settings settings,
ClusterSettings clusterSettings,
Expand Down
Loading