Skip to content

Commit d4e646b

Browse files
committed
plugin service allow multiple extended plugins both extend the same module/plugin
Signed-off-by: Karen X <[email protected]>
1 parent 468f944 commit d4e646b

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3333
- Allow the truncate filter in normalizers ([#19778](https://github.com/opensearch-project/OpenSearch/issues/19778))
3434
- Support pull-based ingestion message mappers and raw payload support ([#19765](https://github.com/opensearch-project/OpenSearch/pull/19765))
3535
- Support dynamic consumer configuration update in pull-based ingestion ([#19963](https://github.com/opensearch-project/OpenSearch/pull/19963))
36+
- Relax jar hell check when extended plugins share transitive dependencies ([#20103](https://github.com/opensearch-project/OpenSearch/pull/20103))
3637

3738
### Changed
3839
- Faster `terms` query creation for `keyword` field with index and docValues enabled ([#19350](https://github.com/opensearch-project/OpenSearch/pull/19350))

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,11 @@ static void checkBundleJarHell(Set<URL> classpath, Bundle bundle, Map<String, Se
728728
Set<URL> intersection = new HashSet<>(urls);
729729
intersection.retainAll(pluginUrls);
730730
if (intersection.isEmpty() == false) {
731-
throw new IllegalStateException(
732-
"jar hell! extended plugins " + exts + " have duplicate codebases with each other: " + intersection
731+
logger.info(
732+
"Plugin [{}] extends multiple plugins/modules that share common dependencies: {}. "
733+
+ "This is expected when extended plugins share common ancestors.",
734+
bundle.plugin.getName(),
735+
intersection
733736
);
734737
}
735738

0 commit comments

Comments
 (0)