Skip to content

OWLS-103825: Available should be true for admin server only domain #3597

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

Closed
wants to merge 3 commits into from
Closed

OWLS-103825: Available should be true for admin server only domain #3597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a54d759
check Domain Status servers to see if admin server only
lennyphan Nov 1, 2022
f8caa67
Identify admin server status by comparing server name
lennyphan Nov 1, 2022
d3eb72b
rename method
lennyphan Nov 1, 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
12 changes: 11 additions & 1 deletion operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,13 +857,23 @@ private Collection<DomainPresenceInfo.ServerStartupInfo> getServerStartupInfos()

// when the domain start policy is ADMIN_ONLY, the admin server is considered to be an application server.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is bit misleading after the change.

private boolean isApplicationServer(String serverName) {
return isAdminOnlyDomain() || !isAdminServer(serverName);
return !isAdminServer(serverName);
}

private boolean isAdminOnlyDomain() {
return isAdminOnlyServerStartPolicy()
|| isOnlyAdminServerRunningInDomain();
}

private boolean isAdminOnlyServerStartPolicy() {
return getDomain().getSpec().getServerStartPolicy() == ServerStartPolicy.ADMIN_ONLY;
}

private boolean isOnlyAdminServerRunningInDomain() {
return status.getServers().size() == 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this doesn't take into account the servers or clusters that have been intentioanlly shut down.

&& status.getServers().get(0).getServerName().equals(getInfo().getAdminServerName());
}

private boolean isAdminServer(String serverName) {
return status.getServers().stream()
.filter(s -> s.getServerName().equals(serverName))
Expand Down
10 changes: 10 additions & 0 deletions operator/src/test/java/oracle/kubernetes/operator/DomainStatusUpdateTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,6 +1736,16 @@ void whenServerStartupInfoIsNull_availableIsFalse() {
hasItems(new ClusterCondition(ClusterConditionType.AVAILABLE).withStatus(FALSE)));
}

@Test
void whenDomainOnlyHasAdminServer_availableIsTrue() {
configureDomain().configureAdminServer();
defineScenario().build();

updateDomainStatus();

assertThat(getRecordedDomain(), hasCondition(AVAILABLE).withStatus(TRUE));
}

private Collection<ClusterCondition> getClusterConditions() {
return testSupport.<ClusterResource>getResourceWithName(KubernetesTestSupport.CLUSTER, "cluster1")
.getStatus().getConditions();
Expand Down