Skip to content

Commit 65b736f

Browse files
committed
Merge pull request #703 from helgi/get_rc_status
ref(scheduler): use a try / except block instead of get_rc_status, allows for more precise handling
2 parents 7d3a402 + 52792ea commit 65b736f

1 file changed

Lines changed: 11 additions & 14 deletions

File tree

rootfs/scheduler/__init__.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -986,22 +986,19 @@ def _create_rc(self, namespace, name, image, command, **kwargs): # noqa
986986
error(resp, 'create ReplicationController "{}" in Namespace "{}"', name, namespace)
987987
logger.debug('template used: {}'.format(json.dumps(template, indent=4)))
988988

989-
create = False
990989
for _ in range(30):
991-
if not create and self._get_rc_status(namespace, name) == 404:
992-
time.sleep(1)
993-
continue
994-
995-
create = True
996-
rc = self._get_rc(namespace, name).json()
997-
# TODO: Does this matter? Is there a better indicator?
998-
if (
999-
"observedGeneration" in rc["status"] and
1000-
rc["metadata"]["generation"] == rc["status"]["observedGeneration"]
1001-
):
1002-
break
990+
try:
991+
rc = self._get_rc(namespace, name).json()
992+
if (
993+
"observedGeneration" in rc["status"] and
994+
rc["metadata"]["generation"] == rc["status"]["observedGeneration"]
995+
):
996+
break
1003997

1004-
time.sleep(1)
998+
time.sleep(1)
999+
except KubeHTTPException as e:
1000+
if e.response.status_code == 404:
1001+
time.sleep(1)
10051002

10061003
return resp.json()
10071004

0 commit comments

Comments
 (0)