Skip to content

Commit 69c6e5c

Browse files
committed
Replicas fix
1 parent c0b97b2 commit 69c6e5c

File tree

1 file changed

+7
-7
lines changed
  • src/main/java/oracle/kubernetes/operator

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -814,12 +814,12 @@ public NextAction apply(Packet packet) {
814814
WlsClusterConfig wlsClusterConfig = scan.getClusterConfig(clusterName);
815815
if (wlsClusterConfig != null) {
816816
for (WlsServerConfig wlsServerConfig : wlsClusterConfig.getServerConfigs()) {
817+
// done with the current cluster
818+
if (startedCount >= cs.getReplicas() && !startAll)
819+
continue cluster;
820+
817821
String serverName = wlsServerConfig.getName();
818822
if (!serverName.equals(asName) && !servers.contains(serverName)) {
819-
// done with the current cluster
820-
if (startedCount >= cs.getReplicas() && !startAll)
821-
continue cluster;
822-
823823
List<V1EnvVar> env = cs.getEnv();
824824
ServerStartup ssi = null;
825825
ssl = spec.getServerStartup();
@@ -874,15 +874,15 @@ else if (StartupControlConstants.AUTO_STARTUPCONTROL.equals(sc)) {
874874
int startedCount = 0;
875875
WlsClusterConfig config = wlsClusterConfig.getValue();
876876
for (WlsServerConfig wlsServerConfig : config.getServerConfigs()) {
877+
if (startedCount >= spec.getReplicas())
878+
break;
877879
String serverName = wlsServerConfig.getName();
878880
if (!serverName.equals(asName) && !servers.contains(serverName)) {
879881
// start server
880882
servers.add(serverName);
881883
ssic.add(new ServerStartupInfo(wlsServerConfig, config, null, null));
884+
startedCount++;
882885
}
883-
// outside the serverName check because these servers are already running
884-
if (++startedCount >= spec.getReplicas())
885-
break;
886886
}
887887
}
888888
}

0 commit comments

Comments
 (0)