jenkins-bot has submitted this change and it was merged.
Change subject: Take status of pod into account as well for webservice status
......................................................................
Take status of pod into account as well for webservice status
Change-Id: Ia035e5ec59e3f72976af83722fd70a56554c551f
---
M toollabs/webservice/backends/kubernetesbackend.py
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/toollabs/webservice/backends/kubernetesbackend.py
b/toollabs/webservice/backends/kubernetesbackend.py
index bb7ba35..508bf47 100644
--- a/toollabs/webservice/backends/kubernetesbackend.py
+++ b/toollabs/webservice/backends/kubernetesbackend.py
@@ -228,10 +228,14 @@
self._delete_obj(pykube.Pod, self.label_selector)
def get_state(self):
- if self._find_obj(pykube.Service, self.label_selector) is not None\
- or self._find_obj(pykube.Deployment, self.label_selector) is
not None:
- # FIXME: Check if pod is running as well
- return Backend.STATE_RUNNING
+ svc = self._find_obj(pykube.Service, self.label_selector)
+ deployment = self._find_obj(pykube.Deployment, self.label_selector)
+ if svc is not None and deployment is not None:
+ pod = self._find_obj(pykube.Pod, self.label_selector)
+ if pod is not None:
+ if pod.obj['status']['phase'] == 'Running':
+ return Backend.STATE_RUNNING
+ return Backend.STATE_PENDING
return Backend.STATE_STOPPED
def _wait_for_pod(self, label_selector, timeout=30):
--
To view, visit https://gerrit.wikimedia.org/r/298455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia035e5ec59e3f72976af83722fd70a56554c551f
Gerrit-PatchSet: 4
Gerrit-Project: operations/software/tools-webservice
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
