Skip to content

Use unique pv path for domains #3031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 5, 2022
Merged

Use unique pv path for domains #3031

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1998316
make the domain path unique since many domains will be created in the
sankarpn May 3, 2022
157dc83
fix the logHome to use unique path
sankarpn May 3, 2022
76894c7
fix the logHome in verification
sankarpn May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,13 +546,14 @@ void testLogHomeChangeEvents() {
Map<String, OffsetDateTime> podsWithTimeStamps = getPodsWithTimeStamps(domainNamespace3,
adminServerPodName, managedServerPodNamePrefix, replicaCount);

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

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

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

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

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

String uniquePath = "/shared/" + domainNamespace + "/domains";

// create pull secrets for WebLogic image when running in non Kind Kubernetes cluster
// this secret is used only for non-kind cluster
createSecretForBaseImages(domainNamespace);
Expand All @@ -757,7 +760,7 @@ private static Domain createDomain(String domainNamespace, String domainUid,
-> File.createTempFile("domain", "properties"),
"Failed to create domain properties file");
Properties p = new Properties();
p.setProperty("domain_path", "/shared/domains");
p.setProperty("domain_path", uniquePath);
p.setProperty("domain_name", domainUid);
p.setProperty("cluster_name", cluster1Name);
p.setProperty("admin_server_name", adminServerName);
Expand All @@ -769,7 +772,7 @@ private static Domain createDomain(String domainNamespace, String domainUid,
p.setProperty("admin_t3_channel_port", Integer.toString(t3ChannelPort));
p.setProperty("number_of_ms", "2");
p.setProperty("managed_server_name_base", managedServerNameBase);
p.setProperty("domain_logs", "/shared/logs");
p.setProperty("domain_logs", uniquePath + "/logs");
p.setProperty("production_mode_enabled", "true");
assertDoesNotThrow(()
-> p.store(new FileOutputStream(domainPropertiesFile), "domain properties file"),
Expand All @@ -792,7 +795,7 @@ private static Domain createDomain(String domainNamespace, String domainUid,
.namespace(domainNamespace))
.spec(new DomainSpec()
.domainUid(domainUid)
.domainHome("/shared/domains/" + domainUid) // point to domain home in pv
.domainHome(uniquePath + "/" + domainUid) // point to domain home in pv
.domainHomeSourceType("PersistentVolume") // set the domain home source type as pv
.image(WEBLOGIC_IMAGE_TO_USE_IN_SPEC)
.imagePullPolicy("IfNotPresent")
Expand All @@ -804,7 +807,7 @@ private static Domain createDomain(String domainNamespace, String domainUid,
.namespace(domainNamespace))
.includeServerOutInPodLog(true)
.logHomeEnabled(Boolean.TRUE)
.logHome("/shared/logs/" + domainUid)
.logHome(uniquePath + "/logs/" + domainUid)
.dataHome("")
.serverStartPolicy(serverStartupPolicy)
.serverPod(new ServerPod() //serverpod
Expand Down