Skip to content

Commit

Permalink
OS-7627 allow wider raidz stripe width in disklayout
Browse files Browse the repository at this point in the history 
Reviewed by: Kody Kantor <kody.kantor@joyent.com>
Approved by: Kody Kantor <kody.kantor@joyent.com>
  • Loading branch information
@jjelinek
jjelinek committed Mar 5, 2019
1 parent 65a9b48 commit a259198
Show file tree
Hide file tree
Showing 6 changed files with 394 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/node_modules/disklayout.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/test/disklayout/16.di.w16.z3.out
View file

This file was deleted.

262 changes: 262 additions & 0 deletions src/test/disklayout/36.0s.w17.z3.out
View file
@@ -0,0 +1,262 @@
{
"vdevs": [
{
"type": "raidz3",
"devices": [
{
"name": "disk00",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk01",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk02",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk03",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk04",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk05",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk06",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk07",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk08",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk09",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk0a",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk0b",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk0c",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk0d",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk0e",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk0f",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk10",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
}
]
},
{
"type": "raidz3",
"devices": [
{
"name": "disk11",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk12",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk13",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk14",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk15",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk16",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk17",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk18",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk19",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk1a",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk1b",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk1c",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk1d",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk1e",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk1f",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk20",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
},
{
"name": "disk21",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": false
}
]
}
],
"capacity": 16803563470848,
"logs": [
{
"name": "disk23",
"vid": "MFG",
"pid": "DISK",
"size": "600127266816",
"solid_state": true
}
]
}
1 change: 1 addition & 0 deletions src/test/disklayout/60.di.w21.z3.out
View file
@@ -0,0 +1 @@
fatal error: 21 is an invalid width for raidz3 and 60 disks (min: 9, max: 20)
11 changes: 8 additions & 3 deletions src/test/disklayout/run
View file
Expand Up @@ -136,6 +136,11 @@ printf "%-16s " 60.0s.w15.out
diff -u 60.di.0s.w15.z3.out /var/tmp/s60.out
rm -f /var/tmp/s60.out

disklayout -s 0 -w 17 -f 36.di > /var/tmp/s34.out
printf "%-16s " 36.0s.w17.z3.out
diff -u 36.0s.w17.z3.out /var/tmp/s34.out
rm -f /var/tmp/s34.out

disklayout -w 15 -f s16.di > /var/tmp/s16.out
printf "%-16s " 16.w15.out
diff -u s16.di.w15.out /var/tmp/s16.out
Expand Down Expand Up @@ -181,9 +186,9 @@ printf "%-16s " 7.w6.z2.out
diff -u 7.di.w6.z2.out /var/tmp/err.out
rm -f /var/tmp/err.out

disklayout -w 16 -f s16.di raidz3 > /var/tmp/err.out
printf "%-16s " 16.w16.z3.out
diff -u 16.di.w16.z3.out /var/tmp/err.out
disklayout -w 21 -f 60.di raidz3 > /var/tmp/err.out
printf "%-16s " 60.di.w21.z3.out
diff -u 60.di.w21.z3.out /var/tmp/err.out
rm -f /var/tmp/err.out

disklayout -w 15 -s 2 -f s16.di raidz3 > /var/tmp/err.out
Expand Down

0 comments on commit a259198

Please sign in to comment.