Merge pull request Yelp#3161 from Yelp/PAASTA-17440_0_instances_is_no…

…t_starting Make new paasta status report the instance state as "Stopped" if the …
ediboko1980 · Aug 6, 2021 · 4c5505d · 4c5505d
2 parents f6d1163 + d1ec417
commit 4c5505d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/paasta_tools/cli/cmds/status.py b/paasta_tools/cli/cmds/status.py
@@ -1205,7 +1205,10 @@ def get_instance_state(status: InstanceStatusKubernetesV2) -> str:
             return PaastaColors.red("Stopping")
     elif status.desired_state == "start":
         if num_versions == 0:
-            return PaastaColors.yellow("Starting")
+            if status.desired_instances == 0:
+                return PaastaColors.red("Stopped")
+            else:
+                return PaastaColors.yellow("Starting")
         if num_versions == 1:
             if num_ready_replicas < status.desired_instances:
                 return PaastaColors.yellow("Launching replicas")

diff --git a/tests/cli/test_cmds_status.py b/tests/cli/test_cmds_status.py
@@ -1259,6 +1259,12 @@ def test_stop(self, mock_kubernetes_status_v2):
         mock_kubernetes_status_v2.desired_state = "stop"
         assert "Stop" in get_instance_state(mock_kubernetes_status_v2)
 
+    def test_stop_if_0_desired_instances(self, mock_kubernetes_status_v2):
+        mock_kubernetes_status_v2.desired_state = "start"
+        mock_kubernetes_status_v2.versions = []
+        mock_kubernetes_status_v2.desired_instances = 0
+        assert "Stop" in get_instance_state(mock_kubernetes_status_v2)
+
     def test_running(self, mock_kubernetes_status_v2):
         mock_kubernetes_status_v2.desired_state = "start"
         instance_state = get_instance_state(mock_kubernetes_status_v2)