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

Fix exiting on llama-serve when user hits ^c #785

Merged
merged 1 commit into from
Feb 11, 2025
Merged

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Feb 11, 2025

Fixes: #753

Summary by Sourcery

Bug Fixes:

  • Fix exiting on llama-serve when user hits ^c.

Copy link
Contributor

sourcery-ai bot commented Feb 11, 2025

Reviewer's Guide by Sourcery

This PR fixes an issue where llama-serve would exit unexpectedly on Ctrl+C by adding the '--init' flag to the container configuration. The change was implemented by modifying the container argument list in the setup_container function, ensuring that signal handling occurs correctly by initializing container processes properly.

Sequence diagram for handling Ctrl+C with '--init' flag

sequenceDiagram
    actor User
    participant LlamaServe
    participant ContainerInit

    User->>LlamaServe: Send SIGINT (Ctrl+C)
    LlamaServe->>ContainerInit: Forward SIGINT (thanks to '--init')
    ContainerInit-->>LlamaServe: Proper signal handling invoked
    LlamaServe->>User: Graceful shutdown initiated
Loading

File-Level Changes

Change Details Files
Introduced the '--init' flag in the container setup to support graceful shutdown on Ctrl+C.
  • Inserted '--init' flag into container argument list in the setup_container function.
  • Ensured that the container is initialized properly for better signal handling.
ramalama/model.py

Possibly linked issues


Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @rhatdan - I've reviewed your changes - here's some feedback:

Overall Comments:

  • It might be good to add a comment explaining why the --init flag is necessary.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@rhatdan
Copy link
Member Author

rhatdan commented Feb 11, 2025

@ericcurtin I tested this locally and it works great with the latest llama.cpp

@dougsland @ericcurtin @bmahabirbu @cgruver PTAL

@ericcurtin
Copy link
Collaborator

"--init Run an init binary inside the container that forwards signals and reaps processes"

that forwards signals... Make sense, great find!

@rhatdan rhatdan merged commit d13d02b into containers:main Feb 11, 2025
14 of 16 checks passed
@rhatdan
Copy link
Member Author

rhatdan commented Feb 11, 2025

llama.cpp folks found it for me.

@bmahabirbu
Copy link
Collaborator

Tested and works!

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

Successfully merging this pull request may close these issues.

ramalama server - CTRL C not working and freeze terminal
3 participants