Skip to content

Commit 0dfd363

Browse files
DarshitChanpuraHarsh Kothari
authored andcommitted
Relaxes jarHell check for optionally extended plugins (opensearch-project#17893)
* Relaxes jarHell check for optionally extended plugins Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds changelog entry Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes Changelog entry Signed-off-by: Darshit Chanpura <dchanp@amazon.com> --------- Signed-off-by: Darshit Chanpura <dchanp@amazon.com> Signed-off-by: Harsh Kothari <techarsh@amazon.com>
1 parent b8f7d4b commit 0dfd363

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5050
- Avoid skewed segment replication lag metric ([#17831](https://github.com/opensearch-project/OpenSearch/pull/17831))
5151
- Increase the default segment counter step size when replica promoting ([#17568](https://github.com/opensearch-project/OpenSearch/pull/17568))
5252
- [WLM] Rename QueryGroup to WorkloadGroup ([#17901](https://github.com/opensearch-project/OpenSearch/pull/17901))
53+
- Relaxes jarHell check for optionally extended plugins([#17893](https://github.com/opensearch-project/OpenSearch/pull/17893)))
5354

5455
### Dependencies
5556
- Bump `com.nimbusds:nimbus-jose-jwt` from 9.41.1 to 10.0.2 ([#17607](https://github.com/opensearch-project/OpenSearch/pull/17607), [#17669](https://github.com/opensearch-project/OpenSearch/pull/17669))

server/src/main/java/org/opensearch/plugins/PluginsService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ static void checkBundleJarHell(Set<URL> classpath, Bundle bundle, Map<String, Se
690690
Set<URL> urls = new HashSet<>();
691691
for (String extendedPlugin : exts) {
692692
Set<URL> pluginUrls = transitiveUrls.get(extendedPlugin);
693-
if (pluginUrls == null && bundle.plugin.isExtendedPluginOptional(extendedPlugin)) {
693+
if (bundle.plugin.isExtendedPluginOptional(extendedPlugin)) {
694694
continue;
695695
}
696696
assert pluginUrls != null : "transitive urls should have already been set for " + extendedPlugin;

0 commit comments

Comments
 (0)