Skip to content

Commit ab8bd9f

Browse files
committed
Use extra paramter for pod-wait-time
1 parent 8ba1258 commit ab8bd9f

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,16 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
268268

269269
Pod startedPod = kubeClient.pods().inNamespace(effectiveKubeNamespace).create(patchedPod);
270270

271-
int totalWaitMs = Integer.parseInt(environment.getProperty("proxy.container-wait-time", "20000"));
272-
Retrying.retry(i -> Readiness.isReady(kubeClient.resource(startedPod).fromServer().get()), totalWaitMs / 1000, 1000);
271+
int totalWaitMs = Integer.parseInt(environment.getProperty("proxy.kubernetes.pod-wait-time", "60000"));
272+
int maxTries = totalWaitMs / 1000;
273+
Retrying.retry(i -> {
274+
if (!Readiness.isReady(kubeClient.resource(startedPod).fromServer().get())) {
275+
if (i > 1 && log != null) log.debug(String.format("Container not ready yet, trying again (%d/%d)", i, maxTries));
276+
return false;
277+
}
278+
return true;
279+
}
280+
, maxTries, 1000);
273281
if (!Readiness.isReady(kubeClient.resource(startedPod).fromServer().get())) {
274282
throw new ContainerProxyException("Container did not become ready in time");
275283
}

0 commit comments

Comments
 (0)