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.

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

fix: support disk discovery on v6 nvme controller Windows VM #2671

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

andyzhangx
Copy link
Member

@andyzhangx andyzhangx commented Nov 25, 2024

What type of PR is this?
/kind bug

What this PR does / why we need it:
fix: support disk discovery on v6 nvme controller Windows VM

Windows team provided the following info:

  • normal scsi data disk
    "Model": "Microsoft Virtual Disk"
  • v6 nvme controller data disk
    "Model": "Virtual_Disk NVME Premium"

thus I think we could use this filter: Where-Object { $_.Model -like "*Virtual?Disk*", I have worked out another PR to fix this issue permanently.

 - scsi data disk
PS C:\> ConvertTo-Json @(Get-CimInstance win32_diskdrive | Where-Object { $_.Model -like "*Virtual?Disk*" } | Select-Object Index, SCSILogicalUnit, SCSITargetId, SCSIPort, SCSIBus, Model)
[
    {
        "Index":  2,
        "SCSILogicalUnit":  0,
        "SCSITargetId":  0,
        "SCSIPort":  3,
        "SCSIBus":  0,
        "Model":  "Microsoft Virtual Disk"
    },
    {
        "Index":  3,
        "SCSILogicalUnit":  1,
        "SCSITargetId":  0,
        "SCSIPort":  3,
        "SCSIBus":  0,
        "Model":  "Microsoft Virtual Disk"
    },
    {
        "Index":  4,
        "SCSILogicalUnit":  2,
        "SCSITargetId":  0,
        "SCSIPort":  3,
        "SCSIBus":  0,
        "Model":  "Microsoft Virtual Disk"
    },
    {
        "Index":  5,
        "SCSILogicalUnit":  3,
        "SCSITargetId":  0,
        "SCSIPort":  3,
        "SCSIBus":  0,
        "Model":  "Microsoft Virtual Disk"
    }
]

- v6 nvme controller data disk
PS C:\hpc> ConvertTo-Json @(Get-CimInstance win32_diskdrive | Where-Object { $_.Model -like "*Virtual?Disk*" } | Select-Object Index, SCSILogicalUnit, SCSITargetId, SCSIPort, SCSIBus, Model)
[
    {
        "Index":  0,
        "SCSILogicalUnit":  0,
        "SCSITargetId":  0,
        "SCSIPort":  0,
        "SCSIBus":  0,
        "Model":  "Virtual_Disk NVME Premium"
    },
    {
        "Index":  2,
        "SCSILogicalUnit":  1,
        "SCSITargetId":  0,
        "SCSIPort":  0,
        "SCSIBus":  0,
        "Model":  "Virtual_Disk NVMe Premium"
    },
    {
        "Index":  3,
        "SCSILogicalUnit":  2,
        "SCSITargetId":  0,
        "SCSIPort":  0,
        "SCSIBus":  0,
        "Model":  "Virtual_Disk NVMe Premium"
    },
    {
        "Index":  4,
        "SCSILogicalUnit":  3,
        "SCSITargetId":  0,
        "SCSIPort":  0,
        "SCSIBus":  0,
        "Model":  "Virtual_Disk NVMe Premium"
    },
    {
        "Index":  5,
        "SCSILogicalUnit":  4,
        "SCSITargetId":  0,
        "SCSIPort":  0,
        "SCSIBus":  0,
        "Model":  "Virtual_Disk NVMe Premium"
    }
]

Which issue(s) this PR fixes:

Fixes #2365, #2661

Requirements:

Special notes for your reviewer:

Release note:

fix: support disk discovery on v6 nvme controller Windows VM

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 25, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 25, 2024
@andyzhangx
Copy link
Member Author

/retest

1 similar comment
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx
Copy link
Member Author

/retest

@k8s-ci-robot
Copy link
Contributor

@andyzhangx: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-azuredisk-csi-driver-external-e2e-single-az 34b3a33 link true /test pull-azuredisk-csi-driver-external-e2e-single-az
pull-azuredisk-csi-driver-e2e-migration-windows 34b3a33 link true /test pull-azuredisk-csi-driver-e2e-migration-windows
pull-azuredisk-csi-driver-e2e-capz-windows-2019-hostprocess 34b3a33 link true /test pull-azuredisk-csi-driver-e2e-capz-windows-2019-hostprocess
pull-azuredisk-csi-driver-e2e-capz-windows-2022-hostprocess 34b3a33 link true /test pull-azuredisk-csi-driver-e2e-capz-windows-2022-hostprocess

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mounting Disks under NVMe diskcontroller in windows failes
3 participants