Skip to content

Commit 878726a

Browse files
committed
testing
1 parent 1aed95f commit 878726a

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

src/main/java/oracle/kubernetes/operator/ServerStatusReader.java

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,25 @@
66
import java.io.IOException;
77
import java.io.InputStreamReader;
88
import java.io.Reader;
9+
import java.nio.CharBuffer;
910
import java.util.ArrayList;
1011
import java.util.Collection;
1112
import java.util.Map;
1213
import java.util.concurrent.ConcurrentHashMap;
1314
import java.util.concurrent.ConcurrentMap;
1415
import java.util.concurrent.TimeUnit;
1516

16-
import com.google.common.io.CharStreams;
17-
1817
import io.kubernetes.client.ApiException;
1918
import io.kubernetes.client.Exec;
2019
import io.kubernetes.client.models.V1ObjectMeta;
2120
import oracle.kubernetes.operator.helpers.CallBuilder;
2221
import oracle.kubernetes.operator.helpers.ClientHelper;
2322
import oracle.kubernetes.operator.helpers.ClientHolder;
2423
import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
24+
import oracle.kubernetes.operator.helpers.ServerKubernetesObjects;
2525
import oracle.kubernetes.operator.logging.LoggingFacade;
2626
import oracle.kubernetes.operator.logging.LoggingFactory;
2727
import oracle.kubernetes.operator.logging.MessageKeys;
28-
import oracle.kubernetes.operator.wlsconfig.WlsDomainConfig;
29-
import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
3028
import oracle.kubernetes.operator.work.NextAction;
3129
import oracle.kubernetes.operator.work.Packet;
3230
import oracle.kubernetes.operator.work.Step;
@@ -69,10 +67,10 @@ public NextAction apply(Packet packet) {
6967
String domainUID = spec.getDomainUID();
7068

7169
Collection<StepAndPacket> startDetails = new ArrayList<>();
72-
WlsDomainConfig scan = info.getScan();
73-
if (scan != null) {
74-
for (Map.Entry<String, WlsServerConfig> entry : scan.getServerConfigs().entrySet()) {
75-
String serverName = entry.getKey();
70+
for (Map.Entry<String, ServerKubernetesObjects> entry : info.getServers().entrySet()) {
71+
String serverName = entry.getKey();
72+
ServerKubernetesObjects sko = entry.getValue();
73+
if (sko != null && sko.getPod().get() != null) {
7674
Packet p = packet.clone();
7775
startDetails.add(new StepAndPacket(
7876
createServerStatusReaderStep(namespace, domainUID, serverName, timeoutSeconds, null), p));
@@ -127,14 +125,23 @@ public NextAction apply(Packet packet) {
127125
ClientHolder holder = helper.take();
128126
Exec exec = new Exec(holder.getApiClient());
129127
try {
128+
129+
// TEST
130+
System.out.println("***** pod: " + podName);
131+
130132
final Process proc = exec.exec(namespace, podName,
131133
new String[] { "/weblogic-operator/scripts/readState.sh" },
132134
KubernetesConstants.CONTAINER_NAME, stdin, tty);
133135

134136
if (proc.waitFor(timeoutSeconds, TimeUnit.SECONDS)) {
135137
String state = null;
136138
try (final Reader reader = new InputStreamReader(proc.getInputStream())) {
137-
state = CharStreams.toString(reader);
139+
CharBuffer buf = CharBuffer.allocate(64); // longest: FAILED_NOT_RESTARTABLE:Y:Y
140+
while (reader.read(buf) >= 0) {}
141+
state = buf.toString();
142+
143+
// TEST
144+
System.out.println("***** state: " + state);
138145
}
139146

140147
@SuppressWarnings("unchecked")

0 commit comments

Comments
 (0)