Move Redis server information to NewRedisHelper
Move Redis server information to NewRedisHelper
- Continue conversion to the new style redis helper with
refactors against the redis server functionality methods
Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
What does this MR do?
Move Redis server information to NewRedisHelper that was added in !7269 (merged)
Testing
- Install GitLab 16.8.0 which ships Redis
7.0.14
- Create an empty file
/etc/gitlab/skip-auto-reconfigure
so that an upgrade will not automatically restart Redis. - Upgrade to package from this MR, which ships Redis
7.0.15
- Run
sudo gitlab-ctl reconfigure
- See the warning about pending Redis restart at the end of the reconfigure log
Related issues
Checklist
See Definition of done.
For anything in this list which will not be completed, please provide a reason in the MR discussion.
Required
-
MR title and description are up to date, accurate, and descriptive. -
MR targeting the appropriate branch. -
Latest Merge Result pipeline is green. -
When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow.
For GitLab team members
If you don't have access to this, the reviewer should trigger these jobs for you during the review process.
-
The manual Trigger:ee-package
jobs have a green pipeline running against latest commit. -
If config/software
orconfig/patches
directories are changed, make sure thebuild-package-on-all-os
job within theTrigger:ee-package
downstream pipeline succeeded. -
If you are changing anything SSL related, then the Trigger:package:fips
manual job within theTrigger:ee-package
downstream pipeline must succeed. -
If CI configuration is changed, the branch must be pushed to dev.gitlab.org
to confirm regular branch builds aren't broken.
Expected (please provide an explanation if not completing)
-
Test plan indicating conditions for success has been posted and passes. -
Documentation created/updated. -
Tests added. -
Integration tests added to GitLab QA. -
Equivalent MR/issue for the GitLab Chart opened. -
Validate potential values for new configuration settings. Formats such as integer 10
, duration10s
, URIscheme://user:passwd@host:port
may require quotation or other special handling when rendered in a template and written to a configuration file.
Merge request reports
Activity
changed milestone to %16.10
assigned to @balasankarc
2 Warnings 1975d1a3: Commits that change 30 or more lines across at least 3 files should describe these changes in the commit body. For more information, take a look at our Commit message guidelines. You've made some changes at the locations which contain user facing configuration.
That's OK as long as you're refactoring existing code and not adding any new
configuration. If you are adding new user facing configuration, consider adding
to gitlab.rb.template located in files/gitlab-config-template/gitlab.rb.template .
Otherwise, please consider adding the typemaintenance label in that case.Reviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not automatically notify them for you.
Reviewer Maintainer @dustinmm80
(UTC-5, 10.5 hours behind
@balasankarc
)@rmarshall
(UTC-4, 9.5 hours behind
@balasankarc
)If needed, you can retry the
danger-review
job that generated this comment.Generated by
DangerEdited by Ghost UserE2E Test Result Summary
allure-report-publisher
generated test report!qa-subset-test:
test report for 1975d1a3expand test summary
+---------------------------------------------------------------------+ | suites summary | +----------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +----------------+--------+--------+---------+-------+-------+--------+ | Release | 15 | 0 | 0 | 0 | 15 | ✅ | | Verify | 105 | 0 | 3 | 0 | 108 | ✅ | | Monitor | 25 | 0 | 1 | 0 | 26 | ✅ | | Govern | 146 | 1 | 13 | 0 | 160 | ❌ | | Systems | 10 | 0 | 0 | 0 | 10 | ✅ | | GitLab Metrics | 2 | 0 | 1 | 0 | 3 | ✅ | | Plan | 157 | 0 | 7 | 0 | 164 | ✅ | | Package | 163 | 0 | 12 | 0 | 175 | ✅ | | Create | 199 | 0 | 20 | 0 | 219 | ✅ | | Data Stores | 93 | 0 | 0 | 0 | 93 | ✅ | | Configure | 1 | 0 | 0 | 0 | 1 | ✅ | | Manage | 2 | 0 | 0 | 0 | 2 | ✅ | | Analytics | 3 | 0 | 0 | 0 | 3 | ✅ | +----------------+--------+--------+---------+-------+-------+--------+ | Total | 921 | 1 | 57 | 0 | 979 | ❌ | +----------------+--------+--------+---------+-------+-------+--------+
Edited by Ghost Useradded 9 commits
-
832ed55c...8b1c40c4 - 8 commits from branch
master
- 3ab08fe9 - Move Redis server information to NewRedisHelper
-
832ed55c...8b1c40c4 - 8 commits from branch
@dustinmm80 Can you please review? Thanks. I've added the test scenario in the MR description.
TLDR: We are decomposing
RedisHelper
to smaller classes with MRs like !7317 (merged), !7326 (merged), and !7333 (merged).This one moves the server information to a similar class. Once all of this is done,
RedisHelper
will be removed, andNewRedisHelper
will be renamed.requested review from @dustinmm80
changed milestone to %16.11
added missed:16.10 label
added workflowin review label
- Resolved by Robert Marshall
Running through test scenario:
- Downloaded GitLab EE 16.8.0 Ubuntu Focal package https://packages.gitlab.com/gitlab/gitlab-ee/packages/ubuntu/focal/gitlab-ee_16.8.0-ee.0_amd64.deb
- Downloaded GitLab EE package for this branch from https://dev.gitlab.org/gitlab/omnibus-gitlab/-/jobs/19571625/artifacts/browse/pkg/ubuntu-jammy/
- Installed 16.8.0 package in a Vagrant machine using harness https://gitlab.com/dustinmm80/omnibus-pg12-test
touch /etc/gitlab/skip-auto-reconfigure
- Installed MR package in the machine,
Unpacking gitlab-ee (16.9.1+rfbranch.318741.832ed55c-0) over (16.8.0-ee.0) ...
gitlab-ctl reconfigure
I do not see a message about pending redis restart at the end of reconfigure log though, only
Infra Phase complete, 27/869 resources updated in 01 minutes 13 seconds gitlab Reconfigured!
@balasankarc am I missing something here in testing?
added 43 commits
-
3ab08fe9...454718e7 - 42 commits from branch
master
- 1975d1a3 - Move Redis server information to NewRedisHelper
-
3ab08fe9...454718e7 - 42 commits from branch
requested review from @apatterson2
LGTM.
-
Green pipeline on gitlab.com at https://gitlab.com/gitlab-org/omnibus-gitlab/-/pipelines/1226882228. -
Green pipeline on dev.gitlab.org at https://dev.gitlab.org/gitlab/omnibus-gitlab/-/pipelines/320578. -
Code examination. -
Ran test plan onubuntu/jammy
VM. Warning is issued:Warnings: The version of the running redis service is different than what is installed. Please restart redis to start the new version.
-
Repeated test plan using base version install using same version of redis (16.9.3). No warning issue as expected.
-
@rmarshall Please merge this one. I do not have perms.
removed review request for @apatterson2
requested review from @rmarshall