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

[Jobs] Allowing to specify intermediate bucket for file upload #4257

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
bbfe91a
debug
zpoint Nov 3, 2024
043dd28
support workdir_bucket_name config on yaml file
zpoint Nov 4, 2024
bc767c8
change the match statement to if else due to mypy limit
zpoint Nov 4, 2024
8200400
pass mypy
zpoint Nov 4, 2024
0e395ca
yapf format fix
zpoint Nov 4, 2024
2b1a063
reformat
zpoint Nov 4, 2024
fa9cc69
remove debug line
zpoint Nov 4, 2024
4c98e11
all dir to same bucket
zpoint Nov 6, 2024
144a4a3
private member function
zpoint Nov 6, 2024
42de23a
fix mypy
zpoint Nov 6, 2024
888c0fa
support sub dir config to separate to different directory
zpoint Nov 7, 2024
3b1adcc
rename and add smoke test
zpoint Nov 8, 2024
06c7891
bucketname
zpoint Nov 9, 2024
3aaf0f1
support sub dir mount
zpoint Nov 11, 2024
0116fa0
private member for _bucket_sub_path and smoke test fix
zpoint Nov 12, 2024
0750900
support copy mount for sub dir
zpoint Nov 12, 2024
51dfcd3
support gcs, s3 delete folder
zpoint Nov 12, 2024
6ba05cc
doc
zpoint Nov 12, 2024
1751fab
r2 remove_objects_from_sub_path
zpoint Nov 12, 2024
3bb60c8
support azure remove directory and cos remove
zpoint Nov 13, 2024
415a089
doc string for remove_objects_from_sub_path
zpoint Nov 13, 2024
f0f1fe1
fix sky jobs subdir issue
zpoint Nov 13, 2024
1a62d06
test case update
zpoint Nov 13, 2024
79ea48a
rename to _bucket_sub_path
zpoint Nov 14, 2024
8fd2c8c
change the config schema
zpoint Nov 14, 2024
7d57aef
setter
zpoint Nov 14, 2024
5da18de
bug fix and test update
zpoint Nov 14, 2024
7c82fd7
delete bucket depends on user config or sky generated
zpoint Nov 15, 2024
cb2a574
add test case
zpoint Nov 15, 2024
df60317
smoke test bug fix
zpoint Nov 15, 2024
a2efd8c
robust smoke test
zpoint Nov 18, 2024
c43c705
fix comment
zpoint Nov 26, 2024
cc8a8a6
bug fix
zpoint Nov 26, 2024
b939f7f
set the storage manually
zpoint Nov 27, 2024
fb0edf5
better structure
zpoint Nov 27, 2024
b640be6
merge master
zpoint Nov 27, 2024
e4619cb
fix mypy
zpoint Nov 27, 2024
abe0d99
Update docs/source/reference/config.rst
zpoint Dec 2, 2024
1669fb8
Update docs/source/reference/config.rst
zpoint Dec 2, 2024
0893794
Merge branch 'master' into dev/zeping/specific_bucket_for_sky_jobs
zpoint Dec 2, 2024
5d7ea0f
limit creation for bucket and delete sub dir only
zpoint Dec 2, 2024
fc2d48e
resolve comment
zpoint Dec 2, 2024
e032fad
Update docs/source/reference/config.rst
zpoint Dec 14, 2024
284b46d
Update sky/utils/controller_utils.py
zpoint Dec 14, 2024
86ffe01
resolve PR comment
zpoint Dec 14, 2024
0613905
bug fix
zpoint Dec 14, 2024
bfd9fd5
merge master
zpoint Dec 14, 2024
d1ae190
bug fix
zpoint Dec 14, 2024
469cede
fix test case
zpoint Dec 14, 2024
faedd28
bug fix
zpoint Dec 14, 2024
8576e14
fix
zpoint Dec 14, 2024
94a0d43
fix test case
zpoint Dec 16, 2024
d4e28dc
bug fix
zpoint Dec 16, 2024
2525b30
support is_sky_managed param in config
zpoint Dec 16, 2024
da6f32d
pass param intermediate_bucket_is_sky_managed
zpoint Dec 16, 2024
4a078c9
resolve PR comment
zpoint Dec 20, 2024
3b9f8bc
Update sky/utils/controller_utils.py
zpoint Dec 24, 2024
2f1e2b7
Merge branch 'master' into dev/zeping/specific_bucket_for_sky_jobs
zpoint Dec 24, 2024
51530a0
hide bucket creation log
zpoint Dec 24, 2024
6232731
reset green color
zpoint Dec 24, 2024
ab84547
rename is_sky_managed to _is_sky_managed
zpoint Dec 24, 2024
bc55222
bug fix
zpoint Dec 24, 2024
80a010a
retrieve _is_sky_managed from stores
zpoint Dec 24, 2024
8708a81
propogate the log
zpoint Dec 27, 2024
c4bac50
Merge branch 'master' into dev/zeping/specific_bucket_for_sky_jobs
zpoint Dec 30, 2024
c101e8b
merge master
zpoint Dec 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
doc
  • Loading branch information
zpoint committed Nov 12, 2024
commit 6ba05cc6c1e539152914e1ee3eec11f67f6de89e
4 changes: 4 additions & 0 deletions docs/source/reference/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ Available fields and semantics:
#
# Ref: https://skypilot.readthedocs.io/en/latest/examples/managed-jobs.html#customizing-job-controller-resources
jobs:
# Bucket to store managed jobs mount files and tmp files.
zpoint marked this conversation as resolved.
Show resolved Hide resolved
# Its optional, if not set, SkyPilot will create a new bucket for each managed jobs .
# Support https|s3|gs|r2|cos
bucket: s3://sky-bucket-with-permission
controller:
resources: # same spec as 'resources' in a task YAML
cloud: gcp
Expand Down
14 changes: 6 additions & 8 deletions sky/utils/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
Schemas conform to the JSON Schema specification as defined at
https://json-schema.org/
"""
import copy
import enum
from typing import Any, Dict, List, Tuple

Expand Down Expand Up @@ -709,14 +708,13 @@ def get_config_schema():
'resources': resources_schema,
}
},
'bucket': {
'type': 'string',
'pattern': '^(https|s3|gs|r2|cos)://.+',
'required': [],
}
}
}
jobs_configs = copy.deepcopy(controller_resources_schema)
jobs_configs['properties']['bucket'] = {
'type': 'string',
'pattern': '^(https|s3|gs|r2|cos)://.+',
'required': []
}
cloud_configs = {
'aws': {
'type': 'object',
Expand Down Expand Up @@ -937,7 +935,7 @@ def get_config_schema():
'required': [],
'additionalProperties': False,
'properties': {
'jobs': jobs_configs,
'jobs': controller_resources_schema,
'spot': controller_resources_schema,
'serve': controller_resources_schema,
'allowed_clouds': allowed_clouds,
Expand Down
Loading