-
Notifications
You must be signed in to change notification settings - Fork 38.7k
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
Add mpio support for iscsi #21304
Add mpio support for iscsi #21304
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
--- | ||
apiVersion: v1 | ||
kind: Pod | ||
metadata: | ||
name: iscsipd | ||
spec: | ||
containers: | ||
- name: iscsipd-ro | ||
image: kubernetes/pause | ||
volumeMounts: | ||
- mountPath: "/mnt/iscsipd" | ||
name: iscsipd-ro | ||
- name: iscsipd-rw | ||
image: kubernetes/pause | ||
volumeMounts: | ||
- mountPath: "/mnt/iscsipd" | ||
name: iscsipd-rw | ||
volumes: | ||
- name: iscsipd-ro | ||
iscsi: | ||
targetPortal: 10.0.2.15:3260 | ||
iqn: iqn.2001-04.com.example:storage.kube.sys1.xyz | ||
lun: 0 | ||
fsType: ext4 | ||
readOnly: true | ||
- name: iscsipd-rw | ||
iscsi: | ||
targetPortal: 10.0.2.15:3260 | ||
iqn: iqn.2001-04.com.example:storage.kube.sys1.xyz | ||
lun: 1 | ||
fsType: ext4 | ||
readOnly: false |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package util | ||
|
||
//DeviceUtil is a util for common device methods | ||
type DeviceUtil interface { | ||
FindMultipathDeviceForDevice(disk string) string | ||
} | ||
|
||
type deviceHandler struct { | ||
get_io IoUtil | ||
} | ||
|
||
//NewDeviceHandler Create a new IoHandler implementation | ||
func NewDeviceHandler(io IoUtil) DeviceUtil { | ||
return &deviceHandler{get_io: io} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
// +build linux | ||
|
||
/* | ||
Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package util | ||
|
||
import ( | ||
"errors" | ||
"strings" | ||
) | ||
|
||
// FindMultipathDeviceForDevice given a device name like /dev/sdx, find the devicemapper parent | ||
func (handler *deviceHandler) FindMultipathDeviceForDevice(device string) string { | ||
io := handler.get_io | ||
disk, err := findDeviceForPath(device, io) | ||
if err != nil { | ||
return "" | ||
} | ||
sysPath := "/sys/block/" | ||
if dirs, err := io.ReadDir(sysPath); err == nil { | ||
for _, f := range dirs { | ||
name := f.Name() | ||
if strings.HasPrefix(name, "dm-") { | ||
if _, err1 := io.Lstat(sysPath + name + "/slaves/" + disk); err1 == nil { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is for unit test There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I don't follow. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. os.IsExist doesn't help us check path existence. |
||
return "/dev/" + name | ||
} | ||
} | ||
} | ||
} | ||
return "" | ||
} | ||
|
||
// findDeviceForPath Find the underlaying disk for a linked path such as /dev/disk/by-path/XXXX or /dev/mapper/XXXX | ||
// will return sdX or hdX etc, if /dev/sdX is passed in then sdX will be returned | ||
func findDeviceForPath(path string, io IoUtil) (string, error) { | ||
devicePath, err := io.EvalSymlinks(path) | ||
if err != nil { | ||
return "", err | ||
} | ||
// if path /dev/hdX split into "", "dev", "hdX" then we will | ||
// return just the last part | ||
parts := strings.Split(devicePath, "/") | ||
if len(parts) == 3 && strings.HasPrefix(parts[1], "dev") { | ||
return parts[2], nil | ||
} | ||
return "", errors.New("Illegal path for device " + devicePath) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there anything here that wouldn't work for
darwin
(i.e. Mac)? Also create an "unsupported" version to gracefully handle unsupported builds (seepkg/volume/util/fs_unsupported.go
, for example).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, not supported on OSX. the path /sys/block, for example, does not exist. We need the _unsupported file.