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

Bundle spark #11093

Merged
merged 1 commit into from
Jul 20, 2024
Merged

Bundle spark #11093

merged 1 commit into from
Jul 20, 2024

Conversation

kashike
Copy link
Member

@kashike kashike commented Jul 16, 2024

discussion: #10565
docs: PaperMC/docs#447

New configuration options (global configuration):

spark:
  # If the bundled spark profiler should be enabled at all.
  enabled: true
  # If the bundled spark profiler should be enabled as soon as possible.
  # If true, spark enables as early as possible. This can be useful for profiling the server during startup.
  # If false, spark enables once the server has finished starting up (when the `Done (4.720s)! For help, type "help"` message is sent in console).
  enable-immediately: false
  # Prefers the spark plugin over the bundled spark profiler.
  # If enabled and the spark plugin is found in the plugins directory, it will be loaded and the bundled spark profiler will not be loaded.
  # If enabled and the spark plugin is not found in the plugins directory, the bundled profiler will be enabled.
  prefer-spark-plugin: false

@kashike kashike requested a review from a team as a code owner July 16, 2024 23:05
@kashike kashike force-pushed the feat/spark branch 2 times, most recently from 3ae21ed to 7e3039e Compare July 17, 2024 00:15
@MiniDigger

This comment was marked as duplicate.

Outfit8TSB

This comment was marked as outdated.

@zlataovce
Copy link
Member

remove timings patch as it's going to replaced with spark. i heard that it's now deprecated and marked for removal in paper.

it is deprecated and turned off by default now, but it shouldn't be removed entirely yet, since there are people which may still want to use it/need to use it

@Outfit8TSB
Copy link

remove timings patch as it's going to replaced with spark. i heard that it's now deprecated and marked for removal in paper.

disregard this comment, this is not gonna happen as this will turned off as default

@Leguan16
Copy link
Contributor

Should also add a config option to disable spark.

@kashike kashike force-pushed the feat/spark branch 4 times, most recently from f96b254 to f05c2a5 Compare July 18, 2024 22:29
@kashike kashike changed the title spark Bundle spark Jul 19, 2024
Copy link
Member

@kennytv kennytv left a comment

Choose a reason for hiding this comment

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

The We recommend installing the spark profiler as a replacement: warning in the timings patch needs updating

It also currently throws exceptions on stop (if you have any other plugin installed) due to a bukkit service being registered with a null plugin, presumably within spark

patches/server/1041-spark.patch Outdated Show resolved Hide resolved
patches/server/1041-spark.patch Outdated Show resolved Hide resolved
@kashike kashike self-assigned this Jul 20, 2024
@kashike kashike merged commit 681c013 into master Jul 20, 2024
5 checks passed
@kashike kashike deleted the feat/spark branch July 20, 2024 16:35
@Outfit8TSB
Copy link

I swear that this will lead to confusion as lucko/spark#424 didn't merge. If Spark keeps disabling after the update, it will get confused, This Pull was necessary to merge. As Spark will get disabled without warning.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

7 participants