From 44601625d0c1cb0388449c8e1d9a20b8790e6085 Mon Sep 17 00:00:00 2001
From: Luca Furst <rlfurst@gmail.com>
Date: Tue, 1 Nov 2022 21:36:40 -0400
Subject: [PATCH 1/2] Actually fix launching apps on multiple clusters

---
 src/lightning_app/runners/cloud.py | 32 ++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/lightning_app/runners/cloud.py b/src/lightning_app/runners/cloud.py
index 919f7548bc09c..00e42bd7f32ea 100644
--- a/src/lightning_app/runners/cloud.py
+++ b/src/lightning_app/runners/cloud.py
@@ -274,7 +274,7 @@ def dispatch(
             if not has_sufficient_credits:
                 logger.warn("You may need Lightning credits to run your apps on the cloud.")
 
-            # right now we only allow a single instance of the app
+            # right now we only allow a single instance of the app per cluster
             find_instances_resp = self.backend.client.lightningapp_instance_service_list_lightningapp_instances(
                 project_id=project.project_id, app_id=lit_app.id
             )
@@ -285,14 +285,25 @@ def dispatch(
             elif CLOUD_QUEUE_TYPE == "redis":
                 queue_server_type = V1QueueServerType.REDIS
 
-            if find_instances_resp.lightningapps:
-                existing_instance = find_instances_resp.lightningapps[0]
+            previous_app_instances = find_instances_resp.lightningapps
+            previous_app_instances = sorted(previous_app_instances, key=lambda i: i.created_at, reverse=True)
 
+            existing_instances_by_cluster = {}
+            for instance in previous_app_instances:
+                if instance.spec.desired_state == V1LightningappInstanceState.RUNNING:
+                    existing_instances_by_cluster[instance.spec.cluster_id] = instance
+
+            if previous_app_instances:
+                most_recent_instance = previous_app_instances[0]
                 if not app_config.cluster_id:
-                    # Re-run the app on the same cluster
-                    app_config.cluster_id = existing_instance.spec.cluster_id
+                    # Re-run the app on the most recent cluster
+                    app_config.cluster_id = most_recent_instance.spec.cluster_id
+
+                # get the existing instance on the cluster, if any
+                existing_instance = existing_instances_by_cluster.get(app_config.cluster_id, None)
 
-                if existing_instance.status.phase != V1LightningappInstanceState.STOPPED:
+                # stop old instances if releasing to the same cluster
+                if existing_instance and existing_instance.status.phase != V1LightningappInstanceState.STOPPED:
                     # TODO(yurij): Implement release switching in the UI and remove this
                     # We can only switch release of the stopped instance
                     existing_instance = self.backend.client.lightningapp_instance_service_update_lightningapp_instance(
@@ -367,7 +378,8 @@ def dispatch(
             repo.package()
             repo.upload(url=lightning_app_release.source_upload_url)
 
-            if find_instances_resp.lightningapps:
+            # updates the app instance if on the same cluster
+            if existing_instance:
                 lightning_app_instance = (
                     self.backend.client.lightningapp_instance_service_update_lightningapp_instance_release(
                         project_id=project.project_id,
@@ -447,9 +459,9 @@ def _check_uploaded_folder(root: Path, repo: LocalSourceCodeDir) -> None:
             )
             if not os.path.exists(os.path.join(root, ".lightningignore")):
                 warning_msg = (
-                    warning_msg
-                    + "\nIn order to ignore some files or folder, "
-                    + "create a `.lightningignore` file and add the paths to ignore."
+                    warning_msg +
+                    "\nIn order to ignore some files or folder, " +
+                    "create a `.lightningignore` file and add the paths to ignore."
                 )
             else:
                 warning_msg += "\nYou can ignore some files or folders by adding them to `.lightningignore`."

From 698669b25daf0d977524af559764c2c694b13531 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 01:40:04 +0000
Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/lightning_app/runners/cloud.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lightning_app/runners/cloud.py b/src/lightning_app/runners/cloud.py
index 00e42bd7f32ea..b8c35c0690b5d 100644
--- a/src/lightning_app/runners/cloud.py
+++ b/src/lightning_app/runners/cloud.py
@@ -459,9 +459,9 @@ def _check_uploaded_folder(root: Path, repo: LocalSourceCodeDir) -> None:
             )
             if not os.path.exists(os.path.join(root, ".lightningignore")):
                 warning_msg = (
-                    warning_msg +
-                    "\nIn order to ignore some files or folder, " +
-                    "create a `.lightningignore` file and add the paths to ignore."
+                    warning_msg
+                    + "\nIn order to ignore some files or folder, "
+                    + "create a `.lightningignore` file and add the paths to ignore."
                 )
             else:
                 warning_msg += "\nYou can ignore some files or folders by adding them to `.lightningignore`."