Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve Lightning App with remote storage #17426

Merged
merged 30 commits into from
Apr 23, 2023
Merged

Resolve Lightning App with remote storage #17426

merged 30 commits into from
Apr 23, 2023

Conversation

tchaton
Copy link
Contributor

@tchaton tchaton commented Apr 21, 2023

What does this PR do?

Currently, accessing the Drive or Path doesn't work. This PR should address it.

Fixes #<issue_number>

Before submitting
  • Was this discussed/agreed via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or minor internal changes/refactors)

PR review

Anyone in the community is welcome to review the PR.
Before you start reviewing, make sure you have read the review guidelines. In short, see the following bullet-list:

Reviewer checklist
  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

cc @Borda @carmocca

@github-actions github-actions bot added the app (removed) Generic label for Lightning App package label Apr 21, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Apr 21, 2023

⚡ Required checks status: All passing 🟢

Groups summary

🟢 lightning_app: Tests workflow
Check ID Status
app-pytest (macOS-11, lightning, 3.8, latest) success
app-pytest (macOS-11, lightning, 3.8, oldest) success
app-pytest (macOS-11, app, 3.9, latest) success
app-pytest (ubuntu-20.04, lightning, 3.8, latest) success
app-pytest (ubuntu-20.04, lightning, 3.8, oldest) success
app-pytest (ubuntu-20.04, app, 3.9, latest) success
app-pytest (windows-2022, lightning, 3.8, latest) success
app-pytest (windows-2022, lightning, 3.8, oldest) success
app-pytest (windows-2022, app, 3.8, latest) success

These checks are required after the changes to src/lightning/app/core/constants.py, src/lightning/app/core/queues.py, src/lightning/app/runners/cloud.py, src/lightning/app/storage/path.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/app_logs.py, src/lightning/app/utilities/packaging/cloud_compute.py, tests/tests_app/core/test_constants.py, tests/tests_app/core/test_lightning_app.py, tests/tests_app/core/test_lightning_flow.py, tests/tests_app/runners/test_cloud.py, tests/tests_app/storage/test_path.py, tests/tests_app/structures/test_structures.py, tests/tests_app/utilities/packaging/test_cloud_compute.py, tests/tests_app/utilities/test_load_app.py.

🟢 lightning_app: Examples
Check ID Status
app-examples (macOS-11, lightning, 3.9, latest) success
app-examples (macOS-11, lightning, 3.9, oldest) success
app-examples (macOS-11, app, 3.9, latest) success
app-examples (ubuntu-20.04, lightning, 3.9, latest) success
app-examples (ubuntu-20.04, lightning, 3.9, oldest) success
app-examples (ubuntu-20.04, app, 3.9, latest) success
app-examples (windows-2022, lightning, 3.9, latest) success
app-examples (windows-2022, lightning, 3.9, oldest) success
app-examples (windows-2022, app, 3.9, latest) success

These checks are required after the changes to src/lightning/app/core/constants.py, src/lightning/app/core/queues.py, src/lightning/app/runners/cloud.py, src/lightning/app/storage/path.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/app_logs.py, src/lightning/app/utilities/packaging/cloud_compute.py, tests/integrations_app/public/test_v0_app.py.

🟢 lightning_app: Azure
Check ID Status
App.cloud-e2e success

These checks are required after the changes to .azure/app-cloud-e2e.yml, src/lightning/app/core/constants.py, src/lightning/app/core/queues.py, src/lightning/app/runners/cloud.py, src/lightning/app/storage/path.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/app_logs.py, src/lightning/app/utilities/packaging/cloud_compute.py, tests/integrations_app/public/test_v0_app.py.

🟢 lightning_app: Docs
Check ID Status
make-doctest (app) success
make-html (app) success

These checks are required after the changes to src/lightning/app/core/constants.py, src/lightning/app/core/queues.py, src/lightning/app/runners/cloud.py, src/lightning/app/storage/path.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/app_logs.py, src/lightning/app/utilities/packaging/cloud_compute.py.

🟢 mypy
Check ID Status
mypy success

These checks are required after the changes to src/lightning/app/core/constants.py, src/lightning/app/core/queues.py, src/lightning/app/runners/cloud.py, src/lightning/app/storage/path.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/app_logs.py, src/lightning/app/utilities/packaging/cloud_compute.py.

🟢 install
Check ID Status
install-pkg (ubuntu-22.04, app, 3.8) success
install-pkg (ubuntu-22.04, app, 3.10) success
install-pkg (ubuntu-22.04, fabric, 3.8) success
install-pkg (ubuntu-22.04, fabric, 3.10) success
install-pkg (ubuntu-22.04, pytorch, 3.8) success
install-pkg (ubuntu-22.04, pytorch, 3.10) success
install-pkg (ubuntu-22.04, lightning, 3.8) success
install-pkg (ubuntu-22.04, lightning, 3.10) success
install-pkg (ubuntu-22.04, notset, 3.8) success
install-pkg (ubuntu-22.04, notset, 3.10) success
install-pkg (macOS-12, app, 3.8) success
install-pkg (macOS-12, app, 3.10) success
install-pkg (macOS-12, fabric, 3.8) success
install-pkg (macOS-12, fabric, 3.10) success
install-pkg (macOS-12, pytorch, 3.8) success
install-pkg (macOS-12, pytorch, 3.10) success
install-pkg (macOS-12, lightning, 3.8) success
install-pkg (macOS-12, lightning, 3.10) success
install-pkg (macOS-12, notset, 3.8) success
install-pkg (macOS-12, notset, 3.10) success
install-pkg (windows-2022, app, 3.8) success
install-pkg (windows-2022, app, 3.10) success
install-pkg (windows-2022, fabric, 3.8) success
install-pkg (windows-2022, fabric, 3.10) success
install-pkg (windows-2022, pytorch, 3.8) success
install-pkg (windows-2022, pytorch, 3.10) success
install-pkg (windows-2022, lightning, 3.8) success
install-pkg (windows-2022, lightning, 3.10) success
install-pkg (windows-2022, notset, 3.8) success
install-pkg (windows-2022, notset, 3.10) success

These checks are required after the changes to src/lightning/app/core/constants.py, src/lightning/app/core/queues.py, src/lightning/app/runners/cloud.py, src/lightning/app/storage/path.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/app_logs.py, src/lightning/app/utilities/packaging/cloud_compute.py.


Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

@awaelchli awaelchli added the bug Something isn't working label Apr 21, 2023
@awaelchli awaelchli added this to the 2.0.x milestone Apr 21, 2023
@mergify mergify bot added the ready PRs ready to be merged label Apr 21, 2023
@Borda Borda changed the title PO: Resolve Lightning App with remote storage Resolve Lightning App with remote storage Apr 21, 2023
@Borda Borda enabled auto-merge (squash) April 21, 2023 10:57
Borda
Borda previously requested changes Apr 21, 2023
src/lightning/app/testing/testing.py Outdated Show resolved Hide resolved
@mergify mergify bot removed the ready PRs ready to be merged label Apr 21, 2023
@tchaton tchaton requested a review from carmocca as a code owner April 21, 2023 15:26
@github-actions github-actions bot added the ci Continuous Integration label Apr 21, 2023
@github-actions github-actions bot removed the ci Continuous Integration label Apr 23, 2023
@github-actions github-actions bot added the ci Continuous Integration label Apr 23, 2023
@@ -67,57 +67,42 @@ jobs:
'App: v0_app':
name: "v0_app"
dir: "public"
queue_type: "redis"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ethanwharris why do we drop redis?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this won't be supported going forward.

@@ -0,0 +1 @@
venv/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is automatically generated when the app runs. Better to have it in the repo.

if value not in _CLUSTER_DRIVERS:
raise ValueError(f"Found {value} cluster driver. The value needs to be in {_CLUSTER_DRIVERS}.")
return value
return "direct"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why unset LIGHTNING_CLUSTER_DRIVER is not enough?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't used and we can drop it entirely.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For another PR once the fire is being us.

@@ -388,19 +388,30 @@ def get(self, timeout: Optional[float] = None) -> Any:
if timeout is None:
while True:
try:
return self._get()
try:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's use contextmanager.suppress(...)

return self._get()
try:
return self._get()
except requests.exceptions.HTTPError:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you pls add a note about why this error happens and it is fine to ignore it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can happen if the queue isn't responsive. This would lead for the app to die entirely. This adds some sort of fault tolerancy during CP re-deployment.

@@ -53,6 +53,7 @@ def check_content(button_name, text_content):
has_logs = False
while not has_logs:
for log in fetch_logs(["flow"]):
print(log)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch !

tests/tests_app/core/test_constants.py Show resolved Hide resolved
@Borda Borda self-requested a review April 23, 2023 21:59
@Borda Borda dismissed their stale review April 23, 2023 21:59

the one break was removed

@mergify mergify bot added the ready PRs ready to be merged label Apr 23, 2023
@williamFalcon williamFalcon merged commit 3688b64 into master Apr 23, 2023
@williamFalcon williamFalcon deleted the debug_drive branch April 23, 2023 22:08
Borda pushed a commit that referenced this pull request Apr 24, 2023
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

---------

Co-authored-by: thomas <thomas@thomass-MacBook-Pro.local>
(cherry picked from commit 3688b64)
Borda pushed a commit that referenced this pull request Apr 24, 2023
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

---------

Co-authored-by: thomas <thomas@thomass-MacBook-Pro.local>
(cherry picked from commit 3688b64)
Borda pushed a commit that referenced this pull request Apr 24, 2023
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

---------

Co-authored-by: thomas <thomas@thomass-MacBook-Pro.local>
(cherry picked from commit 3688b64)
lantiga pushed a commit that referenced this pull request Apr 24, 2023
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

---------

Co-authored-by: thomas <thomas@thomass-MacBook-Pro.local>
(cherry picked from commit 3688b64)
tchaton added a commit that referenced this pull request Apr 24, 2023
---------

Co-authored-by: thomas <thomas@thomass-MacBook-Pro.local>
Borda pushed a commit that referenced this pull request Apr 24, 2023
---------

Co-authored-by: thomas <thomas@thomass-MacBook-Pro.local>
(cherry picked from commit 3688b64)

# Conflicts:
#	examples/app_commands_and_api/.lightningignore
#	tests/tests_app/core/test_constants.py
#	tests/tests_app/runners/test_cloud.py
Borda pushed a commit that referenced this pull request Apr 24, 2023
---------

Co-authored-by: thomas <thomas@thomass-MacBook-Pro.local>
(cherry picked from commit 3688b64)

# Conflicts:
#	examples/app_commands_and_api/.lightningignore
#	tests/tests_app/core/test_constants.py
#	tests/tests_app/runners/test_cloud.py
lantiga pushed a commit that referenced this pull request Apr 26, 2023
---------

Co-authored-by: thomas <thomas@thomass-MacBook-Pro.local>
(cherry picked from commit 3688b64)

# Conflicts:
#	examples/app_commands_and_api/.lightningignore
#	tests/tests_app/core/test_constants.py
#	tests/tests_app/runners/test_cloud.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
app (removed) Generic label for Lightning App package bug Something isn't working ci Continuous Integration ready PRs ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants