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

Update Kitodo.Production and scripts for webhook manager version #98

Merged
merged 30 commits into from
Mar 9, 2024

Conversation

markusweigelt
Copy link
Collaborator

@markusweigelt markusweigelt commented Dec 20, 2023

  • Using current master state of Kitodo.Production
  • Adjust sql examples
  • Improve process dir script to use
  • Makefile improvements: building only specific services using SERVICES env, confirm make down

Copy link
Member

@bertsky bertsky left a comment

Choose a reason for hiding this comment

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

perhaps this PR should also link to slub/ocrd_manager#66

Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@markusweigelt
Copy link
Collaborator Author

@bertsky Adjusted to the changed asynchronous behavior of OCR-D manager. Synchronous is now the default.

Copy link
Member

@bertsky bertsky left a comment

Choose a reason for hiding this comment

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

LGTM.

Just needs to be updated to new Manager (after slub/ocrd_manager#66 itself is finished and merged), and one minor change may be required (see below).

_resources/kitodo/data/scripts/script_ocr_process_dir.sh Outdated Show resolved Hide resolved
_resources/kitodo/data/scripts/script_ocr_process_dir.sh Outdated Show resolved Hide resolved
.github/workflows/makefile-ci.yml Outdated Show resolved Hide resolved
@markusweigelt markusweigelt requested a review from bertsky March 7, 2024 17:38
@bertsky
Copy link
Member

bertsky commented Mar 7, 2024

Wait! One bug did slip through:

ocrd_kitodo/.env

Lines 22 to 23 in b8a3885

MONITOR_DB_ROOT_USER=root # root user of OCR-D database
MONITOR_DB_ROOT_USER=root_password # root password of OCR-D database

Notice the wrong variable name for the pw?

Live this causes:

MongoServerError: Authentication failed.

@bertsky
Copy link
Member

bertsky commented Mar 7, 2024

Also fixed in c59b4cb.

@bertsky
Copy link
Member

bertsky commented Mar 7, 2024

@markusweigelt, short explanation: in trying to make this work, I noticed I do need to update the Controller (because our timeout was partially caused by glitches there, not SSH itself) and added waiting for ocrd-database (because that is what surfaced on the CI as well). So I basically had to put all on one card. Hope all this is sufficient now 🤞

@bertsky
Copy link
Member

bertsky commented Mar 8, 2024

Ok, it finally (!!) seems to work again. For the moment, only locally – but on the CI all we are waiting for is a release of ocrd/core v2.62.3 to PyPI, so ocrd/all:maximum-cuda can be rebuilt (it does already work with ocrd/all:maximum).

I already merged the new Controller, so IMO the next steps should be:

  • update the Controller submodule once more (to the merge commit)
  • merge the Manager
  • update the Manager once more (to the merge commit)
  • merge the Monitor
  • update the Monitor submodule once more (to the merge commit)
  • merge here
  • merge OCR-D Manager base version #100 into main
  • convert everything to stable

@bertsky bertsky merged commit 3f293ac into main Mar 9, 2024
2 checks passed
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.

2 participants