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

Jump to bottom

mariadb: 10.4.15 -> 10.5.8 #91944

Merged
merged 3 commits into from Jan 12, 2021
Merged

mariadb: 10.4.15 -> 10.5.8 #91944

merged 3 commits into from Jan 12, 2021

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented Jul 1, 2020

Upgrade MariaDB server to 10.5.4

cc @thoughtpolice @flokli @aanderse @dasJ

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Izorkin
Copy link
Contributor Author

Izorkin commented Jul 1, 2020

@GrahamcOfBorg eval

@ofborg ofborg bot requested a review from thoughtpolice July 2, 2020 01:08
@Izorkin
Copy link
Contributor Author

Izorkin commented Jul 2, 2020

@ofborg eval

@aanderse
Copy link
Member

aanderse commented Jul 2, 2020

I thought we generally agreed to ship mariadb 10.4.x with NixOS 20.09.

@Izorkin
Copy link
Contributor Author

Izorkin commented Jul 2, 2020

@aanderse 10.5.4 marked as stable. Don't need updating to 10.5 in 20.09?

@flokli
Copy link
Contributor

flokli commented Jul 2, 2020 via email

@Izorkin Izorkin marked this pull request as draft July 2, 2020 10:41
@Izorkin
Copy link
Contributor Author

Izorkin commented Jul 2, 2020

Converted to draft

@Izorkin
Copy link
Contributor Author

Izorkin commented Jul 2, 2020

@GrahamcOfBorg build mariadb

1 similar comment
@Izorkin
Copy link
Contributor Author

Izorkin commented Jul 2, 2020

@GrahamcOfBorg build mariadb

@aanderse
Copy link
Member

@Izorkin we can proceed with this, you can remove the draft. Thank you!

@Izorkin
Copy link
Contributor Author

Izorkin commented Nov 19, 2020

I will redo in a few days

@Izorkin Izorkin changed the title mariadb: 10.4.13 -> 10.5.4 mariadb: 10.4.15 -> 10.5.8 Nov 19, 2020
@Izorkin
Copy link
Contributor Author

Izorkin commented Nov 19, 2020

Update without release notes.

@Izorkin Izorkin marked this pull request as ready for review November 19, 2020 18:22
@ajs124
Copy link
Member

ajs124 commented Nov 19, 2020

@Izorkin are you ok with me merging #104284 first and rebasing on that?

@Izorkin
Copy link
Contributor Author

Izorkin commented Nov 19, 2020

@ajs124 ok.

@ajs124
Copy link
Member

ajs124 commented Nov 19, 2020

On second thought, lets do this the other way around. Do this here first and then just put 10.4.17 directly to 20.09. I already retargeted my PR.

ajs124
ajs124 requested changes Nov 19, 2020
View reviewed changes
nixos/tests/mysql/mysql.nix Outdated Show resolved Hide resolved
pkgs/servers/sql/mariadb/default.nix Show resolved Hide resolved
@ajs124
Copy link
Member

ajs124 commented Nov 20, 2020

This could probably use a release notes entry mentioning the new series and that it drops TokuDB support, but besides that it's fine by me.

@aanderse do you have any (other) objections to this?

@aanderse
Copy link
Member

Yeah if all the tests pass and at least one or two people have tested this branch out, actually updating from mariadb-10.4.x to see the upgrade runs smoothly this should be good to go. Of course our release notes should always mention the need for the sysadmin to explicitly run mysql_upgrade on major version bumps because as a distro we do not take care of that automatically.

@Izorkin
Copy link
Contributor Author

Izorkin commented Nov 20, 2020

Added release notes.

aanderse
aanderse approved these changes Nov 24, 2020
View reviewed changes
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

Has anyone found any time to test an upgrade of this from 10.4.x? Unfortunately I have not.

@Izorkin
Copy link
Contributor Author

Izorkin commented Dec 7, 2020

Fixed collisions

@Izorkin
Copy link
Contributor Author

Izorkin commented Jan 4, 2021

cc @flokli @aanderse @ajs124

aanderse
aanderse approved these changes Jan 7, 2021
View reviewed changes
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

I recommend merging this PR sooner rather than later. The longer this bakes in unstable the better.

@flokli - agree to merge?

nixos/doc/manual/release-notes/rl-2103.xml Show resolved Hide resolved
nixos/doc/manual/release-notes/rl-2103.xml Outdated Show resolved Hide resolved
@Izorkin
Copy link
Contributor Author

Izorkin commented Jan 7, 2021 •
edited

Rebased PR and fixed release notes.

flokli
flokli approved these changes Jan 7, 2021
View reviewed changes
Copy link
Contributor

@flokli flokli left a comment

Choose a reason for hiding this comment

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

LGTM. @aanderse, if the tests succeed, feel free to merge!

@Izorkin
Copy link
Contributor Author

Izorkin commented Jan 12, 2021

Fix conflct files.

@aanderse
Copy link
Member

Thank you very much for your work on this @Izorkin 🎉

@aanderse aanderse merged commit 1cf2987 into NixOS:master Jan 12, 2021
@Izorkin Izorkin deleted the mariadb-update branch January 12, 2021 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli approved these changes

@ajs124 ajs124 ajs124 approved these changes

@aanderse aanderse aanderse approved these changes

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: documentation 10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Izorkin @aanderse @flokli @ajs124 @ryantm