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.

Sign up for GitHub

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

Jump to bottom

Move export events to separate folder #47747

Merged
merged 6 commits into from
Sep 24, 2024
Merged

Move export events to separate folder #47747

merged 6 commits into from
Sep 24, 2024

Conversation

nikitavemuri
Copy link
Contributor

Why are these changes needed?

  • Move export events from session_latest/logs/events to session_latest/logs/export_events
  • Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in

    ray/python/ray/dashboard/modules/event/event_utils.py

    Line 22 in 1e48a03

    all_source_types = set(event_consts.EVENT_SOURCE_ALL)
  • However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Related issue number

Checks

  • I've signed off every commit(by using the -s flag, i.e., git commit -s) in this PR.
  • I've run scripts/format.sh to lint the changes in this PR.
  • I've included any doc changes needed for https://docs.ray.io/en/master/.
    • I've added any new APIs to the API Reference. For example, if I added a
      method in Tune, I've added it in doc/source/tune/api/ under the
      corresponding .rst file.
  • I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/
  • Testing Strategy
    • Unit tests
    • Release tests
    • This PR is not tested :(

Nikita Vemuri added 2 commits September 19, 2024 10:42
change folder and update tests
3a6cafe 
Signed-off-by: Nikita Vemuri <[email protected]>
formatting
effe951 
Signed-off-by: Nikita Vemuri <[email protected]>
@nikitavemuri nikitavemuri added the go add ONLY when ready to merge, run all tests label Sep 19, 2024
update
b45a2e0 
Signed-off-by: Nikita Vemuri <[email protected]>
nikitavemuri
nikitavemuri commented Sep 19, 2024
View reviewed changes
python/ray/tests/test_runtime_env_2.py Outdated
@@ -240,7 +240,7 @@ def job_failed(job_id):
with pytest.raises(AssertionError):
assert_no_user_info_in_logs(USER_SECRET)

assert_no_user_info_in_logs(USER_SECRET, file_whitelist=["runtime_env*.log"])
assert_no_user_info_in_logs(USER_SECRET, file_whitelist=["runtime_env*.log", "event_EXPORT*.log"])
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updating so TestNoUserInfoInLogs::test_basic passes regardless of value of FF

@nikitavemuri nikitavemuri marked this pull request as ready for review September 19, 2024 18:30
@nikitavemuri nikitavemuri requested a review from a team as a code owner September 19, 2024 18:30
formatting and fix test
379a486 
Signed-off-by: Nikita Vemuri <[email protected]>
alanwguo
alanwguo reviewed Sep 23, 2024
View reviewed changes
python/ray/tests/test_runtime_env_2.py
@@ -240,7 +240,9 @@ def job_failed(job_id):
with pytest.raises(AssertionError):
assert_no_user_info_in_logs(USER_SECRET)

assert_no_user_info_in_logs(USER_SECRET, file_whitelist=["runtime_env*.log"])
assert_no_user_info_in_logs(
USER_SECRET, file_whitelist=["runtime_env*.log", "event_EXPORT*.log"]
Copy link
Contributor

Choose a reason for hiding this comment

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

why is this necessary? There shouldn't be "user info" in the export events is there?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Various export events contain runtime env info (which is considered user info) because the runtime env is returned in some dashboard APIs

@rkooo567 rkooo567 enabled auto-merge (squash) September 23, 2024 23:41
Nikita Vemuri added 2 commits September 24, 2024 09:19
@rkooo567 rkooo567 merged commit 1843c31 into ray-project:master Sep 24, 2024
5 checks passed
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
@nikitavemuri @ujjawal-khare
Move export events to separate folder (ray-project#47747)
21a6481 
Move export events from session_latest/logs/events to session_latest/logs/export_events
Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in
ray/python/ray/dashboard/modules/event/event_utils.py

Line 22 in 1e48a03

 all_source_types = set(event_consts.EVENT_SOURCE_ALL)
However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Signed-off-by: ujjawal-khare <[email protected]>
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
@nikitavemuri @ujjawal-khare
Move export events to separate folder (ray-project#47747)
f96f215 
Move export events from session_latest/logs/events to session_latest/logs/export_events
Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in
ray/python/ray/dashboard/modules/event/event_utils.py

Line 22 in 1e48a03

 all_source_types = set(event_consts.EVENT_SOURCE_ALL)
However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Signed-off-by: ujjawal-khare <[email protected]>
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
@nikitavemuri @ujjawal-khare
Move export events to separate folder (ray-project#47747)
5f2fd97 
Move export events from session_latest/logs/events to session_latest/logs/export_events
Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in
ray/python/ray/dashboard/modules/event/event_utils.py

Line 22 in 1e48a03

 all_source_types = set(event_consts.EVENT_SOURCE_ALL)
However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Signed-off-by: ujjawal-khare <[email protected]>
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
@nikitavemuri @ujjawal-khare
Move export events to separate folder (ray-project#47747)
499a88e 
Move export events from session_latest/logs/events to session_latest/logs/export_events
Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in
ray/python/ray/dashboard/modules/event/event_utils.py

Line 22 in 1e48a03

 all_source_types = set(event_consts.EVENT_SOURCE_ALL)
However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Signed-off-by: ujjawal-khare <[email protected]>
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
@nikitavemuri @ujjawal-khare
Move export events to separate folder (ray-project#47747)
87dcdb2 
Move export events from session_latest/logs/events to session_latest/logs/export_events
Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in
ray/python/ray/dashboard/modules/event/event_utils.py

Line 22 in 1e48a03

 all_source_types = set(event_consts.EVENT_SOURCE_ALL)
However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Signed-off-by: ujjawal-khare <[email protected]>
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
@nikitavemuri @ujjawal-khare
Move export events to separate folder (ray-project#47747)
6b54628 
Move export events from session_latest/logs/events to session_latest/logs/export_events
Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in
ray/python/ray/dashboard/modules/event/event_utils.py

Line 22 in 1e48a03

 all_source_types = set(event_consts.EVENT_SOURCE_ALL)
However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Signed-off-by: ujjawal-khare <[email protected]>
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
@nikitavemuri @ujjawal-khare
Move export events to separate folder (ray-project#47747)
53d5e18 
Move export events from session_latest/logs/events to session_latest/logs/export_events
Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in
ray/python/ray/dashboard/modules/event/event_utils.py

Line 22 in 1e48a03

 all_source_types = set(event_consts.EVENT_SOURCE_ALL)
However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Signed-off-by: ujjawal-khare <[email protected]>
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
@nikitavemuri @ujjawal-khare
Move export events to separate folder (ray-project#47747)
c8f16e3 
Move export events from session_latest/logs/events to session_latest/logs/export_events
Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in
ray/python/ray/dashboard/modules/event/event_utils.py

Line 22 in 1e48a03

 all_source_types = set(event_consts.EVENT_SOURCE_ALL)
However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Signed-off-by: ujjawal-khare <[email protected]>
ujjawal-khare pushed a commit to ujjawal-khare-27/ray that referenced this pull request Oct 15, 2024
@nikitavemuri @ujjawal-khare
Move export events to separate folder (ray-project#47747)
2b21a08 
Move export events from session_latest/logs/events to session_latest/logs/export_events
Keeping both event types in the same folder doesn't cause any issue for Ray -- export event files are already filtered out for /events API in
ray/python/ray/dashboard/modules/event/event_utils.py

Line 22 in 1e48a03

 all_source_types = set(event_consts.EVENT_SOURCE_ALL)
However moving these to a separate folder would be better for existing downstream consumers to avoid handling export events in the events folder if they turn the flag on

Signed-off-by: ujjawal-khare <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rkooo567 rkooo567 rkooo567 approved these changes

@alanwguo alanwguo alanwguo approved these changes

Assignees

@rkooo567 rkooo567

Labels
go add ONLY when ready to merge, run all tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nikitavemuri @alanwguo @rkooo567