Merge pull request #2211 from Pandrex247/PAYARA-189

PAYARA-189 Remove GMS and Shoal
payara · Dec 14, 2017 · dbd8a83 · dbd8a83
2 parents 7a04ab8 + b3f0691
commit dbd8a83
Show file tree

Hide file tree

Showing 59 changed files with 290 additions and 2,696 deletions.
diff --git a/appserver/admingui/cluster/src/main/resources/META-INF/admingui/console-config.xml b/appserver/admingui/cluster/src/main/resources/META-INF/admingui/console-config.xml
@@ -72,17 +72,4 @@
             priority="100"
             parentId="#{configNameId}"
             content="/availability/pluginTreeNodeAvailSvc.jsf"/>
-    <integration-point
-            id="gms_node"
-            type="org.glassfish.admingui:navNode"
-            priority="280"
-            parentId="#{configNameId}"
-            content="/configuration/pluginTreeNodeGms.inc"/>
-    <integration-point
-                id="gmsLink"
-                type="org.glassfish.admingui:configuration"
-                priority="280"
-                parentId="propSheetSection"
-                content="/configuration/gmsConfigurationLink.inc"
-        />
 </console-config>
diff --git a/appserver/admingui/cluster/src/main/resources/cluster/clusterGeneral.jsf b/appserver/admingui/cluster/src/main/resources/cluster/clusterGeneral.jsf
@@ -175,34 +175,6 @@
                 <sun:hyperlink id="configlink" text="#{pageSession.valueMap['configRef']}"
                     url="#{request.contextPath}/common/configuration/configuration.jsf?configName=#{pageSession.valueMap['configRef']}" />
             </sun:property>
-
-            <sun:property id="gmsEnabledProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.cluster.GMS}" helpText="$resource{i18ncs.cluster.GMSHelp}">
-                <sun:checkbox id="gmscb" label="$resource{i18n.common.Enabled}" selected="#{pageSession.valueMap['gmsEnabled']}" selectedValue="true" />
-            </sun:property>
-
-           <sun:property id="gmsMulticastPort"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.cluster.gmsMulticastPort}" helpText="$resource{i18ncs.cluster.gmsMulticastPortHelp}">
-                <sun:textField id="gmsMulticastPort"  styleClass="port" columns="$int{60}" maxLength="#{sessionScope.fieldLengths['maxLength.cluster.gmsMulticastPort']}" text="#{pageSession.valueMap['gmsMulticastPort']}"/>
-            </sun:property>
-            <sun:property id="gmsMulticastAddress"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.cluster.gmsMulticastAddress}" helpText="$resource{i18ncs.cluster.gmsMulticastAddressHelp}">
-                <sun:textField id="gmsMulticastAddress"  columns="$int{60}" maxLength="#{sessionScope.fieldLengths['maxLength.cluster.gmsMulticastAddress']}" text="#{pageSession.valueMap['gmsMulticastAddress']}"/>
-            </sun:property>
-
-            <sun:property id="GmsBindInterfaceAddress"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.cluster.gmsBindInterfaceAddress}" helpText="$resource{i18ncs.cluster.gmsBindInterfaceAddressHelp}">
-                <sun:textField id="GmsBindInterfaceAddress"  columns="$int{60}" maxLength="#{sessionScope.fieldLengths['maxLength.cluster.gmsBindInterfaceAddress']}" text="#{pageSession.valueMap['gmsBindInterfaceAddress']}"/>
-            </sun:property>
-
-            <sun:property id="instanceStatusProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.common.status}" >
-                <if condition="#{pageSession.numNotRunning}">
-                    <sun:staticText id="instanceStatusStopped" text=" #{pageSession.numNotRunning}" />
-                    "<br />
-                </if>
-                <if condition="#{pageSession.numRequireRestart}">
-                    <sun:staticText id="instanceStatusRequireRestart" text="#{pageSession.numRequireRestart}" />
-                    "<br />
-                </if>
-                <sun:staticText id="instanceStatusRunning" text="#{pageSession.numRunning}" />
-                "<br />
-            </sun:property>
         </sun:propertySheetSection>
 
     </sun:propertySheet>

diff --git a/...i/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties b/...i/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
@@ -58,7 +58,7 @@ hazelcast.configuration.multicastGroupHelp=The multicast group for communication
 hazelcast.configuration.tcpipMembers=TCP/IP Members
 hazelcast.configuration.tcpipMembersHelp=The list of other data grid members to connect to when Cluster discovery mode is set to tcpip
 hazelcast.configuration.discoveryMode=Cluster Discovery Mode
-hazelcast.configuration.discoveryModeHelp=How should the DAS discovery other server instances in the Data Grid
+hazelcast.configuration.discoveryModeHelp=How should the DAS discover other server instances in the Data Grid
 hazelcast.configuration.interfaces=Network Interfaces
 hazelcast.configuration.interfacesHelp=The list of network interfaces the Data Grid should bind to
 hazelcast.configuration.dasPublicAddress=DAS Public Address

diff --git a/appserver/distributions/minnow/minnow-distributions.xml b/appserver/distributions/minnow/minnow-distributions.xml
@@ -39,6 +39,8 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portions Copyright [2017] [Payara Foundation and/or its affiliates]
+
 -->
 
 <project name="Minnow IPS distribution" default="create-minnow-distributions" basedir=".">
@@ -51,7 +53,6 @@
         <install.package name="glassfish-grizzly"/>
         <install.package name="glassfish-nucleus"/>
         <install.package name="glassfish-common"/>
-        <install.package name="shoal"/>
         <install.package name="glassfish-cluster"/>
         <install.package name="jersey"/>
         <install.package name="glassfish-management"/>

diff --git a/appserver/ejb/ejb-client/pom.xml b/appserver/ejb/ejb-client/pom.xml
@@ -40,6 +40,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2016-2017] [Payara Foundation] -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -93,140 +94,5 @@
             <groupId>javax.ejb</groupId>
             <artifactId>javax.ejb-api</artifactId>
         </dependency>
-        <!-- these 2 dependencies are for compilation only  -->
-<!--
-        <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>javax.xml.soap-api</artifactId>
-            <optional>true</optional>
-        </dependency>        
-        <dependency>
-            <groupId>org.glassfish.metro</groupId>
-            <artifactId>webservices-api-osgi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.hk2</groupId>
-            <artifactId>core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.security</groupId>
-            <artifactId>security-ee</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.core</groupId>
-            <artifactId>kernel</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
-            <artifactId>monitoring-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
-            <artifactId>config-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.deployment</groupId>
-            <artifactId>dol</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.common</groupId>
-            <artifactId>common-util</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.common</groupId>
-            <artifactId>stats77</artifactId>
-            <version>${project.version}</version>
-       </dependency>
-       <dependency>
-            <groupId>org.glassfish.main.deployment</groupId>
-            <artifactId>deployment-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-       <dependency>
-            <groupId>org.glassfish.main.deployment</groupId>
-            <artifactId>deployment-javaee-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.common</groupId>
-            <artifactId>container-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.common</groupId>
-            <artifactId>glassfish-naming</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.persistence</groupId>
-            <artifactId>persistence-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.common</groupId>
-            <artifactId>glassfish-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.connectors</groupId>
-            <artifactId>connectors-internal-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.common</groupId>
-            <artifactId>internal-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.transaction</groupId>
-            <artifactId>transaction-internal-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.ejb</groupId>
-            <artifactId>ejb-internal-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.ejb</groupId>
-            <artifactId>gf-ejb-connector</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.external</groupId>
-            <artifactId>asm-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.pfl</groupId>
-            <artifactId>pfl-dynamic</artifactId>
-	    <optional>true</optional> 
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.orb</groupId>
-            <artifactId>orb-connector</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.ha</groupId>
-            <artifactId>ha-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.cluster</groupId>
-            <artifactId>gms-bootstrap</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.annotations</groupId>
-            <artifactId>logging-annotation-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
--->
     </dependencies>
 </project>
diff --git a/...er/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbContainerAvailability.java b/...er/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbContainerAvailability.java
@@ -99,7 +99,7 @@ public interface EjbContainerAvailability extends ConfigBeanProxy,
      * @return possible object is
      *         {@link String }
      */
-    @Attribute (defaultValue="replicated")
+    @Attribute (defaultValue="hazelcast")
     String getSfsbHaPersistenceType();
 
     /**

diff --git a/appserver/ejb/ejb-container/pom.xml b/appserver/ejb/ejb-container/pom.xml
@@ -260,11 +260,6 @@
             <groupId>org.glassfish.ha</groupId>
             <artifactId>ha-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.cluster</groupId>
-            <artifactId>gms-bootstrap</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.annotations</groupId>
             <artifactId>logging-annotation-processor</artifactId>

diff --git a/...rver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java b/...rver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java
@@ -64,7 +64,7 @@
 import com.sun.enterprise.config.serverbeans.Config;
 import com.sun.enterprise.security.SecurityManager;
 import com.sun.enterprise.util.Utility;
-import com.sun.logging.LogDomains;
+import fish.payara.nucleus.hazelcast.HazelcastCore;
 import org.glassfish.api.admin.ServerEnvironment;
 import org.glassfish.api.deployment.DeployCommandParameters;
 import org.glassfish.api.deployment.DeploymentContext;
@@ -73,8 +73,6 @@
 import org.glassfish.ejb.config.EjbContainerAvailability;
 import org.glassfish.ejb.deployment.descriptor.EjbDescriptor;
 import org.glassfish.ejb.deployment.descriptor.EjbSessionDescriptor;
-import org.glassfish.gms.bootstrap.GMSAdapter;
-import org.glassfish.gms.bootstrap.GMSAdapterService;
 import org.glassfish.ha.store.api.BackingStore;
 import org.glassfish.ha.store.api.BackingStoreConfiguration;
 import org.glassfish.ha.store.api.BackingStoreException;
@@ -197,7 +195,7 @@ public class StatefulContainerFactory extends BaseContainerFactory
     EjbContainer ejbContainerConfig;
 
     @Inject @Optional
-    GMSAdapterService gmsAdapterService;
+    HazelcastCore hazelcast;
 
     private LruSessionCache sessionCache;
 
@@ -343,11 +341,10 @@ private void buildStoreManager()
         vendorMap.put("value.class.is.thread.safe", true);
         vendorMap.put("key.transformer", keyGen);
 
-        if (gmsAdapterService != null) {
-            GMSAdapter gmsAdapter = gmsAdapterService.getGMSAdapter();
-            if (gmsAdapter != null) {
-                conf.setClusterName(gmsAdapter.getClusterName());
-                conf.setInstanceName(gmsAdapter.getModule().getInstanceName());
+        if (hazelcast != null) {
+            if (hazelcast.isEnabled()) {
+                conf.setClusterName(hazelcast.getMemberGroup());
+                conf.setInstanceName(hazelcast.getMemberName());
             }
         }
 

diff --git a/...ontainer/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java b/...ontainer/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java
@@ -46,13 +46,8 @@
 import com.sun.ejb.containers.EJBTimerService;
 import com.sun.enterprise.transaction.api.RecoveryResourceRegistry;
 import com.sun.enterprise.transaction.spi.RecoveryEventListener;
-
-import org.glassfish.gms.bootstrap.GMSAdapter;
-import org.glassfish.gms.bootstrap.GMSAdapterService;
-import com.sun.enterprise.ee.cms.core.CallBack;
-import com.sun.enterprise.ee.cms.core.GMSConstants;
-import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal;
-import com.sun.enterprise.ee.cms.core.Signal;
+import fish.payara.nucleus.cluster.ClusterListener;
+import fish.payara.nucleus.cluster.PayaraCluster;
 
 import org.jvnet.hk2.annotations.Service;
 import javax.inject.Inject;
@@ -63,31 +58,23 @@
 
 @Service
 public class DistributedEJBTimerService
-    implements PersistentTimerService, RecoveryEventListener, PostConstruct, CallBack {
+    implements PersistentTimerService, RecoveryEventListener, PostConstruct, ClusterListener {
 
     private static Logger logger = EjbContainerUtilImpl.getLogger();
 
     @Inject
     private EjbContainerUtil ejbContainerUtil;
 
     @Inject
-    GMSAdapterService gmsAdapterService;
+    PayaraCluster cluster;
 
     @Inject
     RecoveryResourceRegistry recoveryResourceRegistry;
 
     public void postConstruct() {
         if (!ejbContainerUtil.isDas()) {
-            if (gmsAdapterService != null) {
-                GMSAdapter gmsAdapter = gmsAdapterService.getGMSAdapter();
-                if (gmsAdapter != null) {
-                    // We only register interest in the Planned Shutdown event here.
-                    // Because of the dependency between transaction recovery and
-                    // timer migration, the timer migration operation during an
-                    // unexpected failure is initiated by the transaction recovery
-                    // subsystem.
-                    gmsAdapter.registerPlannedShutdownListener(this);
-                }
+            if (cluster != null && cluster.isEnabled()) {
+                cluster.addClusterListener(this);
             }
             // Register for transaction recovery events
             recoveryResourceRegistry.addEventListener(this);
@@ -98,23 +85,6 @@ public void initPersistentTimerService(String target) {
         PersistentEJBTimerService.initEJBTimerService(target);
     }
 
-    @Override
-    public void processNotification(Signal signal) {
-        if (signal instanceof PlannedShutdownSignal) {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.log(Level.FINE, "[DistributedEJBTimerService] planned shutdown signal: " + signal);
-            }
-            PlannedShutdownSignal pssig = (PlannedShutdownSignal)signal;
-            if (pssig.getEventSubType() == GMSConstants.shutdownType.INSTANCE_SHUTDOWN) {
-                migrateTimers(signal.getMemberToken());
-            }
-        } else {
-            if (logger.isLoggable(Level.FINE)) {
-                logger.log(Level.FINE, "[DistributedEJBTimerService] ignoring signal: " + signal);
-            }
-        }
-    }
-
     @Override
     public void beforeRecovery(boolean delegated, String instance) {}
 
@@ -160,5 +130,14 @@ private int migrateTimers( String serverId ) {
         return result;
     }
 
+    @Override
+    public void memberAdded(String memberUUID) {
+    }
+
+    @Override
+    public void memberRemoved(String memberUUID) {
+        migrateTimers(cluster.getMemberName(memberUUID));
+    }
+
 } //DistributedEJBTimerService.java
 
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
@@ -153,13 +153,6 @@
             <type>zip</type>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.packager</groupId>
-            <artifactId>shoal</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.main.packager</groupId>
             <artifactId>glassfish-jmx</artifactId>