oleg-vlsk commented on code in PR #12760:
URL: https://github.com/apache/ignite/pull/12760#discussion_r3030708861
##########
modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java:
##########
@@ -248,22 +235,55 @@ class GridDeploymentLocalStore extends
GridDeploymentStoreAdapter {
* @return Deployment.
*/
@Nullable private GridDeployment deployment(final GridDeploymentMetadata
meta) {
- Deque<GridDeployment> deps = cache.get(meta.alias());
+ Map<ClassLoader, GridDeployment> deps;
+
+ synchronized (mux) {
+ Map<ClassLoader, GridDeployment> cached =
depsByAlias.get(meta.alias());
+
+ deps = cached == null ? null : new IdentityHashMap<>(cached);
+ }
if (deps != null) {
- for (GridDeployment dep : deps) {
- if (dep.undeployed())
- continue;
+ GridDeployment dep = null;
- // local or remote deployment.
- if (dep.classLoaderId() == meta.classLoaderId() ||
dep.classLoader() == meta.classLoader()) {
- if (log.isTraceEnabled())
- log.trace("Deployment was found for class with
specific class loader [alias=" + meta.alias() +
- ", clsLdrId=" + meta.classLoaderId() + "]");
+ if (meta.classLoader() != null)
+ dep = deps.get(meta.classLoader());
- return dep;
+ if (dep == null && meta.classLoaderId() != null) {
+ for (GridDeployment d : deps.values()) {
+ if (d.classLoaderId().equals(meta.classLoaderId())) {
+ dep = d;
+
+ break;
+ }
}
}
+
+ if (dep != null && !dep.undeployed()) {
Review Comment:
Added the `dep.undeployed` check to the loop.
##########
modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentLocalStore.java:
##########
@@ -248,22 +235,55 @@ class GridDeploymentLocalStore extends
GridDeploymentStoreAdapter {
* @return Deployment.
*/
@Nullable private GridDeployment deployment(final GridDeploymentMetadata
meta) {
- Deque<GridDeployment> deps = cache.get(meta.alias());
+ Map<ClassLoader, GridDeployment> deps;
+
+ synchronized (mux) {
+ Map<ClassLoader, GridDeployment> cached =
depsByAlias.get(meta.alias());
+
+ deps = cached == null ? null : new IdentityHashMap<>(cached);
+ }
if (deps != null) {
- for (GridDeployment dep : deps) {
- if (dep.undeployed())
- continue;
+ GridDeployment dep = null;
- // local or remote deployment.
- if (dep.classLoaderId() == meta.classLoaderId() ||
dep.classLoader() == meta.classLoader()) {
- if (log.isTraceEnabled())
- log.trace("Deployment was found for class with
specific class loader [alias=" + meta.alias() +
- ", clsLdrId=" + meta.classLoaderId() + "]");
+ if (meta.classLoader() != null)
+ dep = deps.get(meta.classLoader());
- return dep;
+ if (dep == null && meta.classLoaderId() != null) {
Review Comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
