Skip to content

Commit 082a602

Browse files
authored
Use unique pv path for domains (#3031)
* Use unique pv path for domains
1 parent 0011c0d commit 082a602

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,14 @@ void testLogHomeChangeEvents() {
546546
Map<String, OffsetDateTime> podsWithTimeStamps = getPodsWithTimeStamps(domainNamespace3,
547547
adminServerPodName, managedServerPodNamePrefix, replicaCount);
548548

549+
String newLogHome = "/shared/" + domainNamespace3 + "/domains/logHome";
549550
//print out the original image name
550551
String logHome = domain1.getSpec().getLogHome();
551-
logger.info("Currently the log home used by the domain is: {0}", logHome);
552+
logger.info("Changing the current log home used by the domain : {0} to {1}", logHome, newLogHome);
552553

553554
//change logHome from /shared/logs to /shared/logs/logHome
554555
String patchStr = "["
555-
+ "{\"op\": \"replace\", \"path\": \"/spec/logHome\", \"value\": \"/shared/logs/logHome\"}"
556+
+ "{\"op\": \"replace\", \"path\": \"/spec/logHome\", \"value\": \"" + newLogHome + "\"}"
556557
+ "]";
557558
logger.info("PatchStr for logHome: {0}", patchStr);
558559

@@ -566,7 +567,7 @@ void testLogHomeChangeEvents() {
566567

567568
//print out logHome in the new patched domain
568569
logger.info("In the new patched domain logHome is: {0}", domain1.getSpec().getLogHome());
569-
assertEquals("/shared/logs/logHome", domain1.getSpec().getLogHome(), "logHome is not updated");
570+
assertEquals(newLogHome, domain1.getSpec().getLogHome(), "logHome is not updated");
570571

571572
// verify the server pods are rolling restarted and back to ready state
572573
logger.info("Verifying rolling restart occurred for domain {0} in namespace {1}",
@@ -739,6 +740,8 @@ private static void createDomain(String domainNamespace, String domainUid, Strin
739740
private static Domain createDomain(String domainNamespace, String domainUid,
740741
String pvName, String pvcName, String serverStartupPolicy) {
741742

743+
String uniquePath = "/shared/" + domainNamespace + "/domains";
744+
742745
// create pull secrets for WebLogic image when running in non Kind Kubernetes cluster
743746
// this secret is used only for non-kind cluster
744747
createSecretForBaseImages(domainNamespace);
@@ -757,7 +760,7 @@ private static Domain createDomain(String domainNamespace, String domainUid,
757760
-> File.createTempFile("domain", "properties"),
758761
"Failed to create domain properties file");
759762
Properties p = new Properties();
760-
p.setProperty("domain_path", "/shared/domains");
763+
p.setProperty("domain_path", uniquePath);
761764
p.setProperty("domain_name", domainUid);
762765
p.setProperty("cluster_name", cluster1Name);
763766
p.setProperty("admin_server_name", adminServerName);
@@ -769,7 +772,7 @@ private static Domain createDomain(String domainNamespace, String domainUid,
769772
p.setProperty("admin_t3_channel_port", Integer.toString(t3ChannelPort));
770773
p.setProperty("number_of_ms", "2");
771774
p.setProperty("managed_server_name_base", managedServerNameBase);
772-
p.setProperty("domain_logs", "/shared/logs");
775+
p.setProperty("domain_logs", uniquePath + "/logs");
773776
p.setProperty("production_mode_enabled", "true");
774777
assertDoesNotThrow(()
775778
-> p.store(new FileOutputStream(domainPropertiesFile), "domain properties file"),
@@ -792,7 +795,7 @@ private static Domain createDomain(String domainNamespace, String domainUid,
792795
.namespace(domainNamespace))
793796
.spec(new DomainSpec()
794797
.domainUid(domainUid)
795-
.domainHome("/shared/domains/" + domainUid) // point to domain home in pv
798+
.domainHome(uniquePath + "/" + domainUid) // point to domain home in pv
796799
.domainHomeSourceType("PersistentVolume") // set the domain home source type as pv
797800
.image(WEBLOGIC_IMAGE_TO_USE_IN_SPEC)
798801
.imagePullPolicy("IfNotPresent")
@@ -804,7 +807,7 @@ private static Domain createDomain(String domainNamespace, String domainUid,
804807
.namespace(domainNamespace))
805808
.includeServerOutInPodLog(true)
806809
.logHomeEnabled(Boolean.TRUE)
807-
.logHome("/shared/logs/" + domainUid)
810+
.logHome(uniquePath + "/logs/" + domainUid)
808811
.dataHome("")
809812
.serverStartPolicy(serverStartupPolicy)
810813
.serverPod(new ServerPod() //serverpod

0 commit comments

Comments
 (0)