Merge branch 'develop' into OWLS-70638

Author: rjeberhard

integration-tests/pom.xml

@@ -71,7 +71,12 @@
             <artifactId>client-java</artifactId>
             <scope>test</scope>
         </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>javax.jms</groupId>
+			<artifactId>javax.jms-api</artifactId>
+			<version>2.0</version>
+		</dependency>
+	</dependencies>
 
 
 	<profiles>
@@ -156,6 +161,9 @@
 								<!--<TAGS>${env.TAGS}</TAGS> -->
 								<maxThreads>3</maxThreads>
 							</systemPropertyVariables>
+							<additionalClasspathElements>
+								<additionalClasspathElement>${project.basedir}/src/test/resources/wlthint3client.jar</additionalClasspathElement>
+							</additionalClasspathElements>
     					</configuration>
 
 						<executions>

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -11,6 +11,8 @@
 import java.util.logging.FileHandler;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.ExecCommand;
 import oracle.kubernetes.operator.utils.ExecResult;
@@ -179,6 +181,23 @@ public void testAdminT3Channel(Domain domain) throws Exception {
     logger.info("Done - testAdminT3Channel");
   }
 
+  /**
+   * Verify t3channel port by a JMS connection.
+   *
+   * @throws Exception
+   */
+  public void testAdminT3ChannelWithJMS(Domain domain) throws Exception {
+    logger.info("Inside testAdminT3ChannelWithJMS");
+    ConnectionFactory cf = domain.createJMSConnectionFactory();
+    Connection c = cf.createConnection();
+    logger.info("Connection created successfully before cycle.");
+    domain.shutdownUsingServerStartPolicy();
+    domain.restartUsingServerStartPolicy();
+    c = cf.createConnection();
+    logger.info("Connection created successfully after cycle");
+    c.close();
+    logger.info("Done - testAdminT3ChannelWithJMS");
+  }
   /**
    * Restarting the domain should not have any impact on Operator managing the domain, web app load
    * balancing and node port service

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -568,6 +568,7 @@ public void testAutoSitConfigOverrides() throws Exception {
       domain11 = testDomainCreation(domain11YamlFile);
       domain11.verifyDomainCreated();
       testBasicUseCases(domain11);
+      testAdminT3ChannelWithJMS(domain11);
       // testAdvancedUseCasesForADomain(operator1, domain11);
       testCompletedSuccessfully = true;
 
@@ -638,6 +639,7 @@ public void testCustomSitConfigOverrides() throws Exception {
       domain12 = testDomainCreation(domain12YamlFile);
       domain12.verifyDomainCreated();
       testBasicUseCases(domain12);
+      testAdminT3ChannelWithJMS(domain12);
       // testAdvancedUseCasesForADomain(operator1, domain11);
       testCompletedSuccessfully = true;
 

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -12,9 +12,15 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Map;
 import java.util.Objects;
 import java.util.logging.Logger;
+import javax.jms.ConnectionFactory;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.naming.Context;
+import javax.naming.InitialContext;
 import oracle.kubernetes.operator.BaseTest;
 import org.yaml.snakeyaml.Yaml;
 
@@ -306,6 +312,26 @@ public void deployWebAppViaWLST(
     callShellScriptByExecToPod(username, password, webappName);
   }
 
+  /**
+   * Creates a Connection Factory using JMS.
+   *
+   * @return connection facotry.
+   * @throws Exception
+   */
+  public ConnectionFactory createJMSConnectionFactory() throws Exception {
+    Hashtable<String, String> env = new Hashtable<>();
+    env.put(Context.INITIAL_CONTEXT_FACTORY, "weblogic.jndi.WLInitialContextFactory");
+    env.put(Context.PROVIDER_URL, "t3://" + TestUtils.getHostName() + ":" + t3ChannelPort);
+    logger.info("Creating JNDI context with URL " + env.get(Context.PROVIDER_URL));
+    InitialContext ctx = new InitialContext(env);
+    QueueConnection qcc = null;
+    logger.info("Getting JMS Connection Factory");
+    QueueConnectionFactory cf =
+        (QueueConnectionFactory) ctx.lookup("weblogic.jms.ConnectionFactory");
+    logger.info("Connection Factory created successfully");
+    return cf;
+  }
+
   /**
    * Test http load balancing using loadBalancerWebPort
    *
@@ -457,6 +483,28 @@ public void shutdownUsingServerStartPolicy() throws Exception {
     verifyServerPodsDeleted(replicas);
   }
 
+  /**
+   * restart domain by setting serverStartPolicy to IF_NEEDED
+   *
+   * @throws Exception
+   */
+  public void restartUsingServerStartPolicy() throws Exception {
+    String cmd =
+        "kubectl patch domain "
+            + domainUid
+            + " -n "
+            + domainNS
+            + " -p '{\"spec\":{\"serverStartPolicy\":\"IF_NEEDED\"}}' --type merge";
+    ExecResult result = ExecCommand.exec(cmd);
+    if (result.exitValue() != 0) {
+      throw new RuntimeException(
+          "FAILURE: command " + cmd + " failed, returned " + result.stderr());
+    }
+    String output = result.stdout().trim();
+    logger.info("command to restart domain " + cmd + " \n returned " + output);
+    verifyPodsCreated();
+    verifyServersReady();
+  }
   /**
    * verify domain is deleted
    *

integration-tests/src/test/resources/setupenv.sh

@@ -94,6 +94,12 @@ function create_image_pull_secret_jenkins {
   fi
 }
 
+function get_wlthint3client_from_image {
+  # Get wlthint3client.jar from image
+  id=$(docker create $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC)
+  docker cp $id:/u01/oracle/wlserver/server/lib/wlthint3client.jar $SCRIPTPATH
+  docker rm -v $id
+}
 export SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 export PROJECT_ROOT="$SCRIPTPATH/../../../.."
 export RESULT_ROOT=${RESULT_ROOT:-/scratch/$USER/wl_k8s_test_results}
@@ -192,7 +198,8 @@ elif [ "$JENKINS" = "true" ]; then
 
   /usr/local/packages/aime/ias/run_as_root "mkdir -p $PV_ROOT/acceptance_test_pv_archive"
   /usr/local/packages/aime/ias/run_as_root "chmod 777 $PV_ROOT/acceptance_test_pv_archive"
-
+  
+  get_wlthint3client_from_image
 else
   pull_tag_images
 
@@ -203,4 +210,6 @@ else
 
   export JAR_VERSION="`grep -m1 "<version>" pom.xml | cut -f2 -d">" | cut -f1 -d "<"`"
   docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy --build-arg no_proxy=$no_proxy -t "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}"  --build-arg VERSION=$JAR_VERSION --no-cache=true .
-fi
+  
+  get_wlthint3client_from_image
+fi

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/common/utility.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 #
@@ -20,15 +20,6 @@ function createFolder {
   fi
 }
 
-#
-# Check a file exists
-# $1 - path of file to check
-function checkFileExists {
-  if [ ! -f $1 ]; then
-    fail "The file $1 does not exist"
-  fi
-}
-
 function checkCreateDomainScript {
   if [ -f $1 ]; then
     echo The domain will be created using the script $1

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt/wdt_model_configured.yaml

@@ -10,48 +10,35 @@ topology:
         '@@PROP:clusterName@@':
     Server:
         '@@PROP:adminServerName@@':
-            ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
-            Log:
-                FileName: '/shared/logs/@@PROP:domainUID@@/@@PROP:adminServerName@@.log'
             NetworkAccessPoint:
                 T3Channel:
-                    ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
                     ListenPort: '@@PROP:t3ChannelPort@@'
                     PublicAddress: '@@PROP:t3PublicAddress@@'
                     PublicPort: '@@PROP:t3ChannelPort@@'
         '@@PROP:managedServerNameBase@@1':
             Cluster: '@@PROP:clusterName@@'
-            ListenAddress: '@@PROP:domainUID@@-@@PROP:managedServerNameBase@@1'
             ListenPort: '@@PROP:managedServerPort@@'
             NumOfRetriesBeforeMsiMode: 0
             RetryIntervalBeforeMsiMode: 1
             JTAMigratableTarget:
                 Cluster: '@@PROP:clusterName@@'
                 UserPreferredServer: '@@PROP:managedServerNameBase@@1'
-            Log:
-                FileName: '/shared/logs/@@PROP:domainUID@@/@@PROP:managedServerNameBase@@1.log'
         '@@PROP:managedServerNameBase@@2':
             Cluster: '@@PROP:clusterName@@'
-            ListenAddress: '@@PROP:domainUID@@-@@PROP:managedServerNameBase@@2'
             ListenPort: '@@PROP:managedServerPort@@'
             NumOfRetriesBeforeMsiMode: 0
             RetryIntervalBeforeMsiMode: 1
             JTAMigratableTarget:
                 Cluster: '@@PROP:clusterName@@'
                 UserPreferredServer: '@@PROP:managedServerNameBase@@2'
-            Log:
-                FileName: '/shared/logs/@@PROP:managedServerNameBase@@2.log'
         '@@PROP:managedServerNameBase@@3':
             Cluster: '@@PROP:clusterName@@'
-            ListenAddress: '@@PROP:domainUID@@-@@PROP:managedServerNameBase@@3'
             ListenPort: '@@PROP:managedServerPort@@'
             NumOfRetriesBeforeMsiMode: 0
             RetryIntervalBeforeMsiMode: 1
             JTAMigratableTarget:
                 Cluster: '@@PROP:clusterName@@'
                 UserPreferredServer: '@@PROP:managedServerNameBase@@3'
-            Log:
-                FileName: '/shared/logs/@@PROP:domainUID@@/@@PROP:managedServerNameBase@@3.log'
     MigratableTarget:
         '@@PROP:managedServerNameBase@@1 (migratable)':
             Cluster: '@@PROP:clusterName@@'

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wdt/wdt_model_dynamic.yaml

@@ -16,17 +16,14 @@ topology:
                 ServerTemplate: '@@PROP:clusterName@@-template'
     Server:
         '@@PROP:adminServerName@@':
-            ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
             NetworkAccessPoint:
                 T3Channel:
-                    ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
                     ListenPort: '@@PROP:t3ChannelPort@@'
                     PublicAddress: '@@PROP:t3PublicAddress@@'
                     PublicPort: '@@PROP:t3ChannelPort@@'
     ServerTemplate:
         '@@PROP:clusterName@@-template':
             Cluster: '@@PROP:clusterName@@'
-            ListenAddress: '@@PROP:domainUID@@-@@PROP:managedServerNameBase@@${id}'
             ListenPort: '@@PROP:managedServerPort@@'
             JTAMigratableTarget:
                 Cluster: '@@PROP:clusterName@@'

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wlst/create-domain.py

@@ -1,4 +1,4 @@
-# Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 def getEnvVar(var):
@@ -48,15 +48,13 @@ def getEnvVar(var):
 # Configure the Administration Server
 # ===================================
 cd('/Servers/AdminServer')
-set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
 set('ListenPort', admin_port)
 set('Name', admin_server_name)
 
 create('T3Channel', 'NetworkAccessPoint')
 cd('/Servers/%s/NetworkAccessPoints/T3Channel' % admin_server_name)
 set('PublicPort', t3_channel_port)
 set('PublicAddress', t3_public_address)
-set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
 set('ListenPort', t3_channel_port)
 
 # Set the admin user's username and password
@@ -87,7 +85,6 @@ def getEnvVar(var):
     create(name, 'Server')
     cd('/Servers/%s/' % name )
     print('managed server name is %s' % name);
-    set('ListenAddress', '%s-%s' % (domain_uid, name_svc))
     set('ListenPort', server_port)
     set('NumOfRetriesBeforeMSIMode', 0)
     set('RetryIntervalBeforeMSIMode', 1)
@@ -102,7 +99,6 @@ def getEnvVar(var):
   print('Done creating Server Template: %s' % templateName)
   cd('/ServerTemplates/%s' % templateName)
   cmo.setListenPort(server_port)
-  cmo.setListenAddress('%s-%s${id}' % (domain_uid, managed_server_name_base_svc))
   cmo.setCluster(cl)
   print('Done setting attributes for Server Template: %s' % templateName);
 

kubernetes/samples/scripts/elasticsearch-and-kibana/README.md

@@ -15,6 +15,11 @@ It runs the Elastic Stack on the same host and port that the operator's Helm cha
 to, therefore, you only need to set `elkIntegrationEnabled` to `true` in your
 `values.yaml` file.
 
+To control Elasticsearch memory parameters (Heap allocation and Enabling/Disabling swapping) please open the file `elasticsearch_and_kibana.yaml`, search for env variables of the elasticsearch container and change the values of the following.
+
+* ES_JAVA_OPTS: value may contain for example -Xms512m -Xmx512m to lower the default memory usage (please be aware that this value is only applicable for demo purpose and it is not the one recommended by Elasticsearch itself)
+* bootstrap.memory_lock: value may contain true (enables the usage of mlockall to try to lock the process address space into RAM, preventing any Elasticsearch memory from being swapped out) or false (disables the usage of mlockall to try to lock the process address space into RAM, preventing any Elasticsearch memory from being swapped out). 
+
 To install Elasticsearch and Kibana, use:
 ```
 $  kubectl apply -f kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml