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

bugfix/server-pip-redis-conf #443

Merged
merged 7 commits into from
Aug 18, 2023
+11 −2
Merged

bugfix/server-pip-redis-conf #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7888493
resolve CHANGELOG conflict
bgunnar5 Aug 4, 2023
ec13acf
Merge branch 'develop' of https://github.com/LLNL/merlin into develop
bgunnar5 Aug 4, 2023
e8993b9
resolve merge conflicts and merge with develop
bgunnar5 Aug 17, 2023
13b9b18
add *.conf to the MANIFEST file so pip will grab the redis.conf file
bgunnar5 Aug 18, 2023
455d0bc
add note explaining how to fix a hanging merlin server start
bgunnar5 Aug 18, 2023
f385832
modify CHANGELOG
bgunnar5 Aug 18, 2023
3f2bca0
add second export option to docs and fix typo
bgunnar5 Aug 18, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

### Added
- The *.conf regex for the recursive-include of the merlin server directory so that pip will add it to the wheel
- A note to the docs for how to fix an issue where the `merlin server start` command hangs

### Changed
- Bump certifi from 2022.12.7 to 2023.7.22 in /docs
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
recursive-include merlin/data *.yaml *.py
recursive-include merlin/server *.yaml *.py
recursive-include merlin/server *.yaml *.py *.conf
recursive-include merlin/examples *
include requirements.txt
include requirements/*
Expand Down
2 changes: 1 addition & 1 deletion docs/source/merlin_server.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Merlin Server
=============
The merlin server command allows users easy access to containerized broker
and results servers for merlin workflows. This allowsusers to run merlin without
and results servers for merlin workflows. This allows users to run merlin without
a dedicated external server.

The main configuration will be stored in the subdirectory called "server/" by
Expand Down
7 changes: 7 additions & 0 deletions docs/source/server/commands.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ Starting up a Merlin Server (``merlin server start``)

Starts the container located in the local merlin server configuration.

.. note::
If this command seems to hang and never release control back to you, follow these steps:

1. Kill the command with ``Ctrl+C``
2. Run either ``export LC_ALL="C.UTF-8"`` or ``export LC_ALL="C"``
3. Re-run the ``merlin server start`` command

Stopping an exisiting Merlin Server (``merlin server stop``)
------------------------------------------------------------

Expand Down