Upgrade to Hazelcast 4.2 with tenant control

payara · Mar 26, 2021 · a73dc8c · a73dc8c
1 parent 1ee30c3
commit a73dc8c
Show file tree

Hide file tree

Showing 15 changed files with 263 additions and 1,042 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,6 +5,9 @@ def DOMAIN_NAME
 def payaraBuildNumber
 pipeline {
     agent any
+    options {
+        disableConcurrentBuilds()
+    }
     environment {
         MP_METRICS_TAGS='tier=integration'
         MP_CONFIG_CACHE_DURATION=0

diff --git a/appserver/tests/payara-samples/micro-programmatic/pom.xml b/appserver/tests/payara-samples/micro-programmatic/pom.xml
@@ -27,14 +27,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-impl-base</artifactId>
-        </dependency>
     </dependencies>
 
     <profiles>

diff --git a/...cro-programmatic/src/test/java/fish/payara/samples/programatic/DeployApplicationTest.java b/...cro-programmatic/src/test/java/fish/payara/samples/programatic/DeployApplicationTest.java
diff --git a/...samples/micro-programmatic/src/test/java/fish/payara/samples/programatic/TestServlet.java b/...samples/micro-programmatic/src/test/java/fish/payara/samples/programatic/TestServlet.java
diff --git a/...b/gf-web-connector/src/main/java/fish/payara/appserver/context/JavaEEContextUtilImpl.java b/...b/gf-web-connector/src/main/java/fish/payara/appserver/context/JavaEEContextUtilImpl.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2016-2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2021] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -146,11 +146,14 @@ private boolean isLoaded(String componentId, ComponentInvocation invocation) {
                 : compEnvMgr.getJndiNameEnvironment(componentId);
         if (env != null) {
             ApplicationInfo appInfo = appRegistry.get(DOLUtils.getApplicationFromEnv(env).getRegistrationName());
-            Collection<ModuleInfo> modules = appInfo.getModuleInfos();
-            String moduleName = DOLUtils.getModuleName(env);
-            if (modules.stream().filter(mod -> mod.getName().equals(moduleName))
-                    .anyMatch(moduleInfo -> !moduleInfo.isLoaded())) {
-                return false;
+            if (appInfo != null) {
+                // Check if deployed vs. Payara internal application
+                Collection<ModuleInfo> modules = appInfo.getModuleInfos();
+                String moduleName = DOLUtils.getModuleName(env);
+                if (modules.stream().filter(mod -> mod.getName().equals(moduleName))
+                        .anyMatch(moduleInfo -> !moduleInfo.isLoaded())) {
+                    return false;
+                }
             }
         }
         return env != null;

diff --git a/...odules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/hazelcast/HazelcastCore.java b/...odules/hazelcast-bootstrap/src/main/java/fish/payara/nucleus/hazelcast/HazelcastCore.java
@@ -62,7 +62,6 @@
 import static com.hazelcast.spi.properties.ClusterProperty.WAIT_SECONDS_BEFORE_JOIN;
 import com.sun.enterprise.util.Utility;
 import fish.payara.nucleus.events.HazelcastEvents;
-import fish.payara.nucleus.hazelcast.contextproxy.CachingProviderProxy;
 import org.glassfish.api.StartupRunLevel;
 import org.glassfish.api.admin.ServerEnvironment;
 import org.glassfish.api.admin.ServerEnvironment.Status;
@@ -534,7 +533,7 @@ private synchronized void bootstrapHazelcast() {
             }
             setAttribute(theInstance.getCluster().getLocalMember().getUuid(), INSTANCE_ATTRIBUTE, memberName);
             setAttribute(theInstance.getCluster().getLocalMember().getUuid(), INSTANCE_GROUP_ATTRIBUTE, memberGroup);
-            hazelcastCachingProvider = new CachingProviderProxy(new HazelcastServerCachingProvider(theInstance), context);
+            hazelcastCachingProvider = new HazelcastServerCachingProvider(theInstance);
             bindToJNDI();
             if(env.getStatus() == Status.started) {
                 // only issue this event if the server is already running,