TRUNK-6650: Verify database authentication in startup.sh before starting Tomcat#6193
Open
suubi-joshua wants to merge 2 commits into
Open
TRUNK-6650: Verify database authentication in startup.sh before starting Tomcat#6193suubi-joshua wants to merge 2 commits into
suubi-joshua wants to merge 2 commits into
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #6193 +/- ##
============================================
- Coverage 59.34% 59.29% -0.05%
- Complexity 9331 9332 +1
============================================
Files 695 695
Lines 37460 37460
Branches 5517 5517
============================================
- Hits 22231 22213 -18
- Misses 13232 13246 +14
- Partials 1997 2001 +4 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of what I changed
The
startup.shscript currently waits for the database TCP port to be available viawait-for-it.sh, but does not verify that MariaDB is actually ready to accept authenticated connections. On Galera clusters and container orchestrators, the TCP port can open before InnoDB recovery completes, causing OpenMRS to start against a not-yet-ready database.This adds a credential-verified check (
mariadb -e "SELECT 1"with retry) after the TCP port check and before Tomcat starts. Themariadb-clientpackage is installed in the Docker image so themariadbcommand is available at runtime.30 retries at 2-second intervals (60s total) are sufficient since
wait-for-it.shalready confirms the port is open, only the brief InnoDB recovery window (~12s on Galera) needs to pass.This PR is as a result of this PR openmrs/openmrs-contrib-cluster#14
Issue I worked on
see https://openmrs.atlassian.net/browse/TRUNK-6650
Checklist: I completed these to help reviewers :)
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master