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

Remove MasterService class #17151

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Remove MasterService class #17151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...nternalClusterTest/java/org/opensearch/clustermanager/ClusterManagerTaskThrottlingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void onFailure(Exception e) {

assertEquals(totalRequest + throttledRequest.get(), requestCountOnClusterManager.get());
assertBusy(
() -> { assertEquals(clusterService().getMasterService().numberOfThrottledPendingTasks(), throttledRequest.get()); }
() -> { assertEquals(clusterService().getClusterManagerService().numberOfThrottledPendingTasks(), throttledRequest.get()); }
);
} finally {
clusterSettingCleanUp();
Expand Down
991 changes: 988 additions & 3 deletions server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 0 additions & 22 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 @@ -41,7 +41,6 @@
import org.opensearch.cluster.ClusterStateTaskExecutor;
import org.opensearch.cluster.ClusterStateTaskListener;
import org.opensearch.cluster.LocalNodeClusterManagerListener;
import org.opensearch.cluster.LocalNodeMasterListener;
import org.opensearch.cluster.NodeConnectionsService;
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.routing.OperationRouting;
Expand Down Expand Up @@ -247,25 +246,10 @@ public void addLocalNodeClusterManagerListener(LocalNodeClusterManagerListener l
clusterApplierService.addLocalNodeClusterManagerListener(listener);
}

/**
* Add a listener for on/off local node cluster-manager events
* @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #addLocalNodeClusterManagerListener}
*/
@Deprecated
public void addLocalNodeMasterListener(LocalNodeMasterListener listener) {
addLocalNodeClusterManagerListener(listener);
}

public ClusterManagerService getClusterManagerService() {
return clusterManagerService;
}

/** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerService()} */
@Deprecated
public MasterService getMasterService() {
return clusterManagerService;
}

/**
* Getter and Setter for IndexingPressureService, This method exposes IndexingPressureService stats to other plugins for usage.
* Although Indexing Pressure instances can be accessed via Node and NodeService class but none of them are
Expand All @@ -291,12 +275,6 @@ public static boolean assertClusterOrClusterManagerStateThread() {
return true;
}

/** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #assertClusterOrClusterManagerStateThread} */
@Deprecated
public static boolean assertClusterOrMasterStateThread() {
return assertClusterOrClusterManagerStateThread();
}

public ClusterName getClusterName() {
return clusterName;
}
Expand Down
Loading
Loading