Merge ~mwhudson/curtin:install-to-resyncing-raid into curtin:master

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: c102e4113143f6318d1c945a87fc0b6d0ca0f49a
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~mwhudson/curtin:install-to-resyncing-raid
Merge into: curtin:master
Diff against target: 16 lines (+3/-2)
1 file modified
curtin/block/mdadm.py (+3/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Dan Bungert Approve
Review via email: mp+406969@code.launchpad.net

Commit message

mdadm: allow installation to a syncing array

LP: #1939563

To post a comment you must log in.
Revision history for this message
Dan Bungert (dbungert) wrote :

LGTM

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

that was infrastructure failing, trying again

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Well something else went wrong with the retry but after all the subtests succeeded so going to try merging this.

Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/curtin/block/mdadm.py b/curtin/block/mdadm.py
index a5dfc9f..7bb6b96 100644
--- a/curtin/block/mdadm.py
+++ b/curtin/block/mdadm.py
@@ -749,8 +749,9 @@ def md_check_array_state(md_devname):
749 raise ValueError('Array not in writable state: ' + md_devname)749 raise ValueError('Array not in writable state: ' + md_devname)
750 if degraded is not None and degraded != "0":750 if degraded is not None and degraded != "0":
751 raise ValueError('Array in degraded state: ' + md_devname)751 raise ValueError('Array in degraded state: ' + md_devname)
752 if degraded is not None and sync_action != "idle":752 if degraded is not None and sync_action not in ("idle", "resync"):
753 raise ValueError('Array syncing, not idle state: ' + md_devname)753 raise ValueError(
754 'Array is %s, not idle: %s' % (sync_action, md_devname))
754755
755756
756def md_check_uuid(md_devname):757def md_check_uuid(md_devname):

Subscribers

People subscribed via source and target branches