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

Testing/manager #14

Open
wants to merge 72 commits into
base: feature/coverage
Choose a base branch
from
Open

Testing/manager #14

wants to merge 72 commits into from

Commits on Jul 23, 2024

  1. Include celerymanager and update celeryadapter to check the status of… 

    … celery workers.
    @ryannova
    ryannova committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    78ef619 View commit details
    Browse the repository at this point in the history

  2. Fixed issue where the update status was outside of if statement for c… 

    …hecking workers
    @ryannova
    ryannova committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    8561a18 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Include worker status stop and add template for merlin restart

    @ryannova
    ryannova committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    1120dd7 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Added comment to the CeleryManager init

    @ryannova
    ryannova committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    f41938f View commit details
    Browse the repository at this point in the history

  2. Increment db_num instead of being fixed

    @ryannova
    ryannova committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    690115e View commit details
    Browse the repository at this point in the history

  3. Added other subprocess parameters and created a linking system for re… 

    …dis to store env dict
    @ryannova
    ryannova committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    de4ffd0 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Implemented stopping of celery workers and restarting workers properly

    @ryannova
    ryannova committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    67e9268 View commit details
    Browse the repository at this point in the history

  2. Update stopped to stalled for when the worker doesn't respond to restart

    @ryannova
    ryannova committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    406e4c2 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Working merlin manager run but start and stop not working properly

    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    78e4525 View commit details
    Browse the repository at this point in the history

  2. Made fix for subprocess to start new shell and fixed manager start an… 

    …d stop
    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    eca74ac View commit details
    Browse the repository at this point in the history

  3. Added comments and update changelog

    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    ec8aa78 View commit details
    Browse the repository at this point in the history

  4. Include style fixes

    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    3f04d24 View commit details
    Browse the repository at this point in the history

  5. Fix style for black

    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    5538f4b View commit details
    Browse the repository at this point in the history

  6. Revert launch_job script that was edited when doing automated lint

    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    b6bcd33 View commit details
    Browse the repository at this point in the history

  7. Move importing of CONFIG to be within redis_connection due to error o… 

    …f config not being created yet
    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    9b97f8b View commit details
    Browse the repository at this point in the history

  8. Added space to fix style

    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    c9dfd31 View commit details
    Browse the repository at this point in the history

  9. Revert launch_jobs.py:

    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    a9bd865 View commit details
    Browse the repository at this point in the history

  10. Update import of all merlin.config to be in the function

    @ryannova
    ryannova committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    ddc7614 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. suggested changes plus beginning work on monitor/manager collab

    @bgunnar5
    bgunnar5 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    353a66b View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. move managers to their own folder and fix ssl problems

    @bgunnar5
    bgunnar5 committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    1a4d416 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. final PR touch ups

    @bgunnar5
    bgunnar5 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    875f137 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from bgunnar5/monitor_manager_collab 

    Merlin Manager x Merlin Monitor Integration
    @ryannova
    ryannova authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    9020aa0 View commit details
    Browse the repository at this point in the history

  3. Fix lint style changes

    @ryannova
    ryannova committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    58da9bc View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Fixed issue with context manager

    @ryannova
    ryannova committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    e75dcc2 View commit details
    Browse the repository at this point in the history

  2. Reset file that was incorrect changed

    @ryannova
    ryannova committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    11f9e7c View commit details
    Browse the repository at this point in the history

  3. Check for ssl cert before applying to Redis connection

    @ryannova
    ryannova committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    7204e46 View commit details
    Browse the repository at this point in the history

  4. Comment out Active tests for celerymanager

    @ryannova
    ryannova committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    53d8f32 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Fix lint issue with unused import after commenting out Active celery … 

    …tests
    @ryannova
    ryannova committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    a5ccb2d View commit details
    Browse the repository at this point in the history

  2. Fixed style for import

    @ryannova
    ryannova committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    2b0e8a6 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Fixed kwargs being modified when making a copy for saving to redis wo… 

    …rker args.
    @ryannova
    ryannova committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    e49f378 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Added password check and omit if a password doesn't exist

    @ryannova
    ryannova committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    352e7df View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. change testing log level to debug

    @bgunnar5
    bgunnar5 committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    75a9972 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. add debug statement for redis_connection

    @bgunnar5
    bgunnar5 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    c27a208 View commit details
    Browse the repository at this point in the history

  2. change debug log to info so github ci will display it

    @bgunnar5
    bgunnar5 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    97a9cf1 View commit details
    Browse the repository at this point in the history

  3. attempt to fix password missing from Namespace error

    @bgunnar5
    bgunnar5 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    ce8bf37 View commit details
    Browse the repository at this point in the history

  4. run checks for all necessary configurations

    @bgunnar5
    bgunnar5 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    5851d9d View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. convert stop-workers tests to pytest format

    @bgunnar5
    bgunnar5 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    97d075e View commit details
    Browse the repository at this point in the history

  2. update github wf and comment out stop-workers tests in definitions.py

    @bgunnar5
    bgunnar5 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    04e9122 View commit details
    Browse the repository at this point in the history

  3. add missing key to GH wf file

    @bgunnar5
    bgunnar5 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    f93c7f6 View commit details
    Browse the repository at this point in the history

  4. fix invalid syntax in definitions.py

    @bgunnar5
    bgunnar5 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    835399c View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. comment out stop_workers tests

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    176ff4d View commit details
    Browse the repository at this point in the history

  2. playing with new caches for workflow CI

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    e38cc93 View commit details
    Browse the repository at this point in the history

  3. fix yaml syntax error

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    c136058 View commit details
    Browse the repository at this point in the history

  4. fix typo for getting runner os

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    56a6a05 View commit details
    Browse the repository at this point in the history

  5. fix test and add python version to CI cache

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    f45a798 View commit details
    Browse the repository at this point in the history

  6. add in common-setup step again with caches this time

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    290d350 View commit details
    Browse the repository at this point in the history

  7. run fix-style

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    8a1bc14 View commit details
    Browse the repository at this point in the history

  8. update CHANGELOG

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    58622ba View commit details
    Browse the repository at this point in the history

  9. fix remaining style issues

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    917f8d7 View commit details
    Browse the repository at this point in the history

  10. run without caches to compare execution time of test suite

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    91c7505 View commit details
    Browse the repository at this point in the history

  11. resolve merge conflict

    @bgunnar5
    bgunnar5 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    c7adb96 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. allow redis config to not use ssl

    @bgunnar5
    bgunnar5 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    608e00e View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. remove stop-workers and query-workers tests from definitions.py

    @bgunnar5
    bgunnar5 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    bf41a2d View commit details
    Browse the repository at this point in the history

  2. create helper_funcs file with common testing functions

    @bgunnar5
    bgunnar5 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    630c9c9 View commit details
    Browse the repository at this point in the history

  3. move query-workers to pytest and add base class w/ stop-workers tests

    @bgunnar5
    bgunnar5 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    17889fd View commit details
    Browse the repository at this point in the history

  4. update CHANGELOG

    @bgunnar5
    bgunnar5 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    5c28b49 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. final changes for the stop-workers & query-workers tests

    @bgunnar5
    bgunnar5 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    643b4d1 View commit details
    Browse the repository at this point in the history

  2. run fix-style

    @bgunnar5
    bgunnar5 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    0f0264c View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. move stop and query workers tests to the same file

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    6340604 View commit details
    Browse the repository at this point in the history

  2. run fix-style

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    19c4bf7 View commit details
    Browse the repository at this point in the history

  3. go back to original cache setup

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    99257d8 View commit details
    Browse the repository at this point in the history

  4. try new cache for singularity install

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f947eae View commit details
    Browse the repository at this point in the history

  5. fix syntax issue in github workflow

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    beafb22 View commit details
    Browse the repository at this point in the history

  6. attempt to fix singularity cache

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    fac2892 View commit details
    Browse the repository at this point in the history

  7. remove ls statement that breaks workflow

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    c49660a View commit details
    Browse the repository at this point in the history

  8. revert back to no common setup

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    ecb1762 View commit details
    Browse the repository at this point in the history

  9. remove unnecessary dependency

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    39d09d6 View commit details
    Browse the repository at this point in the history

  10. update github actions versions to use latest

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    5f4673b View commit details
    Browse the repository at this point in the history

  11. update action versions that didn't save

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    70e540f View commit details
    Browse the repository at this point in the history

  12. merge in new tests for stop and query workers commands

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    94f8f72 View commit details
    Browse the repository at this point in the history

  13. run fix-style

    @bgunnar5
    bgunnar5 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    d2e85ec View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. move distributed test suite actions back to v2

    @bgunnar5
    bgunnar5 committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    9c4fca4 View commit details
    Browse the repository at this point in the history