-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Admission Controller Module Transport Interceptor Initial Commit
Signed-off-by: Ajay Kumar Movva <[email protected]>
- Loading branch information
Ajay Kumar Movva
committed
Sep 3, 2023
1 parent
e98ded6
commit f60c6b5
Showing
29 changed files
with
1,736 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
apply plugin: 'opensearch.java-rest-test' | ||
|
||
opensearchplugin { | ||
description 'Plugin intercepting requests and throttle based on resource consumption' | ||
classname 'org.opensearch.throttling.OpenSearchThrottlingModulePlugin' | ||
} | ||
|
||
dependencies { | ||
api project(path: ':modules:reindex') | ||
} | ||
|
||
testClusters.all { | ||
module ':modules:reindex' | ||
} |
53 changes: 53 additions & 0 deletions
53
.../throttling/src/main/java/org/opensearch/throttling/OpenSearchThrottlingModulePlugin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
package org.opensearch.throttling; | ||
|
||
import org.opensearch.common.util.concurrent.ThreadContext; | ||
import org.opensearch.core.common.io.stream.NamedWriteableRegistry; | ||
import org.opensearch.plugins.NetworkPlugin; | ||
import org.opensearch.plugins.Plugin; | ||
import org.opensearch.throttling.admissioncontroller.AdmissionControllerService; | ||
import org.opensearch.throttling.admissioncontroller.transport.AdmissionControllerTransportInterceptor; | ||
import org.opensearch.transport.TransportInterceptor; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
/** | ||
* This plugin is used to register handlers to intercept both rest and transport requests. | ||
*/ | ||
public class OpenSearchThrottlingModulePlugin extends Plugin implements NetworkPlugin { | ||
|
||
AdmissionControllerService admissionControllerService; | ||
|
||
/** | ||
* Default Constructor for plugin | ||
*/ | ||
public OpenSearchThrottlingModulePlugin() {} | ||
|
||
/** | ||
* Returns a list of {@link TransportInterceptor} instances that are used to intercept incoming and outgoing | ||
* transport (inter-node) requests. This must not return <code>null</code> | ||
* | ||
* @param namedWriteableRegistry registry of all named writeables registered | ||
* @param threadContext a {@link ThreadContext} of the current nodes or clients that can be used to set additional | ||
* headers in the interceptors | ||
* @return list of transport interceptors | ||
*/ | ||
@Override | ||
public List<TransportInterceptor> getTransportInterceptors(NamedWriteableRegistry namedWriteableRegistry, ThreadContext threadContext) { | ||
this.admissionControllerService = AdmissionControllerService.getInstance(); | ||
List<TransportInterceptor> interceptors = new ArrayList<>(0); | ||
// TODO Will throw exception in next PR's. This needs to ensure the service is up before adding into transport interceptor. | ||
if (this.admissionControllerService != null) { | ||
interceptors.add(new AdmissionControllerTransportInterceptor(this.admissionControllerService)); | ||
} | ||
return interceptors; | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
modules/throttling/src/main/java/org/opensearch/throttling/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
/** | ||
* Package contains classes related to throttling plugins | ||
*/ | ||
package org.opensearch.throttling; |
39 changes: 39 additions & 0 deletions
39
modules/throttling/src/main/plugin-metadata/plugin-security.policy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
/* | ||
* Modifications Copyright OpenSearch Contributors. See | ||
* GitHub history for details. | ||
*/ | ||
|
||
grant { | ||
// needed to generate runtime classes | ||
permission java.lang.RuntimePermission "createClassLoader"; | ||
|
||
// needed to find the classloader to load allowlisted classes from | ||
permission java.lang.RuntimePermission "getClassLoader"; | ||
}; |
67 changes: 67 additions & 0 deletions
67
...ttling/src/test/java/org/opensearch/throttling/OpenSearchThrottlingModulePluginTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
package org.opensearch.throttling; | ||
|
||
import org.opensearch.cluster.service.ClusterService; | ||
import org.opensearch.common.settings.ClusterSettings; | ||
import org.opensearch.common.settings.Settings; | ||
import org.opensearch.core.common.io.stream.NamedWriteableRegistry; | ||
import org.opensearch.test.OpenSearchTestCase; | ||
import org.opensearch.threadpool.TestThreadPool; | ||
import org.opensearch.threadpool.ThreadPool; | ||
import org.opensearch.throttling.admissioncontroller.AdmissionControllerService; | ||
import org.opensearch.throttling.admissioncontroller.transport.AdmissionControllerTransportInterceptor; | ||
import org.opensearch.transport.TransportInterceptor; | ||
|
||
import java.util.List; | ||
|
||
import static org.mockito.Mockito.mock; | ||
|
||
public class OpenSearchThrottlingModulePluginTests extends OpenSearchTestCase { | ||
OpenSearchThrottlingModulePlugin openSearchThrottlingModulePlugin; | ||
private ClusterService clusterService; | ||
private ThreadPool threadPool; | ||
|
||
@Override | ||
public void setUp() throws Exception { | ||
threadPool = new TestThreadPool("admission_controller_settings_test"); | ||
clusterService = new ClusterService( | ||
Settings.EMPTY, | ||
new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS), | ||
threadPool | ||
); | ||
super.setUp(); | ||
} | ||
|
||
@Override | ||
public void tearDown() throws Exception { | ||
super.tearDown(); | ||
threadPool.shutdownNow(); | ||
} | ||
|
||
public void testGetTransportInterceptors() { | ||
openSearchThrottlingModulePlugin = new OpenSearchThrottlingModulePlugin(); | ||
List<TransportInterceptor> interceptors = openSearchThrottlingModulePlugin.getTransportInterceptors( | ||
mock(NamedWriteableRegistry.class), | ||
threadPool.getThreadContext() | ||
); | ||
assertEquals(interceptors.size(), 0); | ||
AdmissionControllerService admissionControllerService = AdmissionControllerService.newAdmissionControllerService( | ||
Settings.EMPTY, | ||
clusterService.getClusterSettings(), | ||
threadPool | ||
); | ||
interceptors = openSearchThrottlingModulePlugin.getTransportInterceptors( | ||
mock(NamedWriteableRegistry.class), | ||
threadPool.getThreadContext() | ||
); | ||
assertEquals(interceptors.size(), 1); | ||
assertEquals(interceptors.get(0).getClass(), AdmissionControllerTransportInterceptor.class); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.