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.

Sign up for GitHub

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

disk: fix parameter checks in NewNodeServer #917

Merged
merged 4 commits into from
Dec 7, 2023
Merged

disk: fix parameter checks in NewNodeServer #917

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b499c0d
fix parameter checks in newNodeServer
dongjiang1989 Nov 30, 2023
45ce72a
update by review
dongjiang1989 Nov 30, 2023
e969975
Update pkg/disk/nodeserver.go
dongjiang1989 Dec 4, 2023
4fb54d3
fix nits
dongjiang1989 Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions pkg/disk/nodeserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ const (
CreateDiskARN = "alibabacloud.com/createdisk-arn"
// SocketPath is path of connector sock
SocketPath = "/host/etc/csi-tool/diskconnector.sock"
// MaxVolumesPerNode define max ebs one node
MaxVolumesPerNode = 15
// DefaultMaxVolumesPerNode define default max ebs one node
DefaultMaxVolumesPerNode = 15
// MaxVolumesPerNodeLimit define limit max ebs one node
MaxVolumesPerNodeLimit = 64
// NOUUID is xfs fs mount opts
NOUUID = "nouuid"
// NodeMultiZoneEnable Enable node multi-zone mode
Expand All @@ -118,15 +120,15 @@ type QueryResponse struct {

// NewNodeServer creates node server
func NewNodeServer(d *csicommon.CSIDriver, c *ecs.Client) csi.NodeServer {
var maxVolumesNum int64 = MaxVolumesPerNode
var maxVolumesNum int64 = DefaultMaxVolumesPerNode
volumeNum := os.Getenv("MAX_VOLUMES_PERNODE")
if "" != volumeNum {
num, err := strconv.ParseInt(volumeNum, 10, 64)
if err != nil {
log.Log.Fatalf("NewNodeServer: MAX_VOLUMES_PERNODE must be int64, but get: %s", volumeNum)
} else {
if num < 0 || num > maxVolumesNum {
log.Log.Errorf("NewNodeServer: MAX_VOLUMES_PERNODE must between 0-%d, but get: %s", maxVolumesNum, volumeNum)
if num < 0 || num > MaxVolumesPerNodeLimit {
log.Log.Errorf("NewNodeServer: MAX_VOLUMES_PERNODE must between 0-%d, but get: %s", int64(MaxVolumesPerNodeLimit), volumeNum)
dongjiang1989 marked this conversation as resolved.
Show resolved Hide resolved
} else {
maxVolumesNum = num
log.Log.Infof("NewNodeServer: MAX_VOLUMES_PERNODE is set to(not default): %d", maxVolumesNum)
Expand Down
4 changes: 2 additions & 2 deletions pkg/disk/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,15 +1578,15 @@ func getVolumeCount() int64 {
// if auth failed, return with default
if err != nil && strings.Contains(err.Error(), "Forbidden") {
log.Errorf("getVolumeCount: describe instance type with error: %s", err.Error())
return MaxVolumesPerNode
return DefaultMaxVolumesPerNode
// not forbidden error, retry
} else if err != nil && !strings.Contains(err.Error(), "Forbidden") {
time.Sleep(time.Duration(1) * time.Second)
continue
}
if len(response.InstanceTypes.InstanceType) != 1 {
log.Warnf("getVolumeCount: get instance max volume failed type with %v", response)
return MaxVolumesPerNode
return DefaultMaxVolumesPerNode
}
availableVolumeCount = response.InstanceTypes.InstanceType[0].DiskQuantity - existsDiskCount
log.Infof("getVolumeCount: get instance max volume %d type with response %v", availableVolumeCount, response)
Expand Down