Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
8e4ab129
Commit
8e4ab129
authored
Aug 23, 2018
by
Pengfei Ni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix panic when choosing zone or zones for volume
parent
687553a4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
1 deletion
+33
-1
util.go
pkg/volume/util/util.go
+11
-1
util_test.go
pkg/volume/util/util_test.go
+22
-0
No files found.
pkg/volume/util/util.go
View file @
8e4ab129
...
@@ -520,6 +520,11 @@ func GetPath(mounter volume.Mounter) (string, error) {
...
@@ -520,6 +520,11 @@ func GetPath(mounter volume.Mounter) (string, error) {
// This means that a StatefulSet's volumes (`claimname-statefulsetname-id`) will spread across available zones,
// This means that a StatefulSet's volumes (`claimname-statefulsetname-id`) will spread across available zones,
// assuming the id values are consecutive.
// assuming the id values are consecutive.
func
ChooseZoneForVolume
(
zones
sets
.
String
,
pvcName
string
)
string
{
func
ChooseZoneForVolume
(
zones
sets
.
String
,
pvcName
string
)
string
{
// No zones available, return empty string.
if
zones
.
Len
()
==
0
{
return
""
}
// We create the volume in a zone determined by the name
// We create the volume in a zone determined by the name
// Eventually the scheduler will coordinate placement into an available zone
// Eventually the scheduler will coordinate placement into an available zone
hash
,
index
:=
getPVCNameHashAndIndexOffset
(
pvcName
)
hash
,
index
:=
getPVCNameHashAndIndexOffset
(
pvcName
)
...
@@ -541,6 +546,12 @@ func ChooseZoneForVolume(zones sets.String, pvcName string) string {
...
@@ -541,6 +546,12 @@ func ChooseZoneForVolume(zones sets.String, pvcName string) string {
// ChooseZonesForVolume is identical to ChooseZoneForVolume, but selects a multiple zones, for multi-zone disks.
// ChooseZonesForVolume is identical to ChooseZoneForVolume, but selects a multiple zones, for multi-zone disks.
func
ChooseZonesForVolume
(
zones
sets
.
String
,
pvcName
string
,
numZones
uint32
)
sets
.
String
{
func
ChooseZonesForVolume
(
zones
sets
.
String
,
pvcName
string
,
numZones
uint32
)
sets
.
String
{
// No zones available, return empty set.
replicaZones
:=
sets
.
NewString
()
if
zones
.
Len
()
==
0
{
return
replicaZones
}
// We create the volume in a zone determined by the name
// We create the volume in a zone determined by the name
// Eventually the scheduler will coordinate placement into an available zone
// Eventually the scheduler will coordinate placement into an available zone
hash
,
index
:=
getPVCNameHashAndIndexOffset
(
pvcName
)
hash
,
index
:=
getPVCNameHashAndIndexOffset
(
pvcName
)
...
@@ -554,7 +565,6 @@ func ChooseZonesForVolume(zones sets.String, pvcName string, numZones uint32) se
...
@@ -554,7 +565,6 @@ func ChooseZonesForVolume(zones sets.String, pvcName string, numZones uint32) se
// PVC placement (which could also e.g. avoid putting volumes in overloaded or
// PVC placement (which could also e.g. avoid putting volumes in overloaded or
// unhealthy zones)
// unhealthy zones)
zoneSlice
:=
zones
.
List
()
zoneSlice
:=
zones
.
List
()
replicaZones
:=
sets
.
NewString
()
startingIndex
:=
index
*
numZones
startingIndex
:=
index
*
numZones
for
index
=
startingIndex
;
index
<
startingIndex
+
numZones
;
index
++
{
for
index
=
startingIndex
;
index
<
startingIndex
+
numZones
;
index
++
{
...
...
pkg/volume/util/util_test.go
View file @
8e4ab129
...
@@ -647,6 +647,17 @@ func TestChooseZoneForVolume(t *testing.T) {
...
@@ -647,6 +647,17 @@ func TestChooseZoneForVolume(t *testing.T) {
VolumeName
:
"medium-henley--4"
,
VolumeName
:
"medium-henley--4"
,
Expected
:
"c"
,
// hash("") + 4 == 2 mod 3
Expected
:
"c"
,
// hash("") + 4 == 2 mod 3
},
},
// Test for no zones
{
Zones
:
sets
.
NewString
(),
VolumeName
:
"medium-henley--1"
,
Expected
:
""
,
},
{
Zones
:
nil
,
VolumeName
:
"medium-henley--2"
,
Expected
:
""
,
},
}
}
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
...
@@ -992,6 +1003,17 @@ func TestChooseZonesForVolume(t *testing.T) {
...
@@ -992,6 +1003,17 @@ func TestChooseZonesForVolume(t *testing.T) {
NumZones
:
3
,
NumZones
:
3
,
Expected
:
sets
.
NewString
(
"a"
/* hash("henley") == 0 + 3 + 6(startingIndex) */
,
"b"
,
"c"
),
Expected
:
sets
.
NewString
(
"a"
/* hash("henley") == 0 + 3 + 6(startingIndex) */
,
"b"
,
"c"
),
},
},
// Test for no zones
{
Zones
:
sets
.
NewString
(),
VolumeName
:
"henley-1"
,
Expected
:
sets
.
NewString
(),
},
{
Zones
:
nil
,
VolumeName
:
"henley-2"
,
Expected
:
sets
.
NewString
(),
},
}
}
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment