Skip to content

merge queue: embarking devel (982f093) and #5936 together#5948

Closed
mergify[bot] wants to merge 6 commits into
develfrom
mergify/merge-queue/ce251b8f72
Closed

merge queue: embarking devel (982f093) and #5936 together#5948
mergify[bot] wants to merge 6 commits into
develfrom
mergify/merge-queue/ce251b8f72

Conversation

@mergify

@mergify mergify Bot commented Jan 20, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch devel (982f093) and #5936 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #5936.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • any of:
    • all of:
      • base=devel
      • status-success=codespell
      • status-success=go-test
      • status-success=golangci-lint
      • status-success=lint-extras
      • status-success=mod-check
      • status-success=multi-arch-build
      • status-success=uncommitted-code-check
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.32
          • status-success=ci/centos/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/k8s-e2e-external-storage/1.34
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.34
          • status-success=ci/centos/mini-e2e/k8s-1.32
          • status-success=ci/centos/mini-e2e/k8s-1.33
          • status-success=ci/centos/mini-e2e/k8s-1.34
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
    • all of:
      • base~=^(release-.+)$
      • status-success=codespell
      • status-success=go-test
      • status-success=golangci-lint
      • status-success=lint-extras
      • status-success=mod-check
      • status-success=multi-arch-build
      • status-success=uncommitted-code-check
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.32
          • status-success=ci/centos/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/k8s-e2e-external-storage/1.34
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.34
          • status-success=ci/centos/mini-e2e/k8s-1.32
          • status-success=ci/centos/mini-e2e/k8s-1.33
          • status-success=ci/centos/mini-e2e/k8s-1.34
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
    • all of:
      • base=release-v3.15
      • status-success=codespell
      • status-success=go-test
      • status-success=golangci-lint
      • status-success=lint-extras
      • status-success=mod-check
      • status-success=multi-arch-build
      • status-success=uncommitted-code-check
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.31
          • status-success=ci/centos/mini-e2e-helm/k8s-1.31
          • status-success=ci/centos/mini-e2e/k8s-1.31
          • status-success=ci/centos/k8s-e2e-external-storage/1.32
          • status-success=ci/centos/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • status-success=ci/centos/mini-e2e/k8s-1.32
          • status-success=ci/centos/mini-e2e/k8s-1.33
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
    • all of:
      • base=ci/centos
      • status-success=ci/centos/jjb-validate
      • status-success=ci/centos/job-validation

Required conditions to stay in the queue:

---
checking_base_sha: 982f0934732f9f03ed6393201197caf1c4225e1c
previous_failed_batches: []
pull_requests:
  - number: 5936
...

gadididi and others added 6 commits January 18, 2026 10:05
@gadididi
nvmeof: fix DeleteNamespace to be idempotent
68e5e36 
add another case, if the subsystem of the rquested
ns (that we want to remove) does not exist, dont raise an error.

Signed-off-by: gadi-didi <gadi.didi@ibm.com>
@gadididi
nvmeof: fix NVMeoF resource cleanup on CreateVolume failure
c4d2dbc 
When CreateVolume fails during NVMe-oF resource setup
(e.g., listener creation failure), the cleanup defer was
not executing properly because createNVMeoFResources()
returned nil for nvmeofData on error. This left
orphaned subsystems on the gateway that prevented subsequent volume
creation attempts.
Changes:
- Modified createNVMeoFResources() to return nvmeofData even on error
  (instead of nil), allowing cleanup to access gateway connection info
  and subsystem details
- Added NamespaceID > 0 check in cleanupNVMeoFResources() to skip
  namespace deletion when it was never created (NamespaceID defaults
  to 0)

Signed-off-by: gadi-didi <gadi.didi@ibm.com>
@gadididi
nvmeof: Enhanced cleanupEmptySubsystem() to be idempotent
c29026d 
when there is some failure to remove some listener,
it is ok to just print warning, because delete the subsystem will
delete the listener.

Signed-off-by: gadi-didi <gadi.didi@ibm.com>
@gadididi
nvmeof: fix ensureSubsystem() bug
49a7a9f 
before this change,if the subsystem exists,it would not
create listeners. but maybe another pvc on same subsystem
but with different listener\s was requested, it would not
create the listener\s (in manual mode of adding the listeners)
now, even the subsystem exists, if we are in manual listener mode
try to add them (if they exist, it is ok)

Signed-off-by: gadi-didi <gadi.didi@ibm.com>
@gadididi
nvmeof: fix defer location of cleanup nvmeof
8ebc1c2 
the defer in CreateVolume() for cleanup the
NVMe-oF resoureces was in incorrect place,
so in case of createNVMeoFResources() failure
it was not called at all.

Signed-off-by: gadi-didi <gadi.didi@ibm.com>
@mergify
Merge of #5936
6266131
@ceph-csi-bot ceph-csi-bot added bug Something isn't working ci/skip/e2e skip running e2e CI jobs component/nvme-of Issues and PRs related to NVMe-oF. queued ok-to-test Label to trigger E2E tests labels Jan 20, 2026
@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.34

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.34

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.32

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.33

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.34

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.32

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.33

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.32

@ceph-csi-bot

ceph-csi-bot commented Jan 20, 2026

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.33

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Jan 20, 2026
@mergify mergify Bot mentioned this pull request Jan 20, 2026
Merged
6 tasks
@mergify mergify Bot closed this Jan 20, 2026
@mergify mergify Bot deleted the mergify/merge-queue/ce251b8f72 branch January 20, 2026 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

bug Something isn't working ci/skip/e2e skip running e2e CI jobs component/nvme-of Issues and PRs related to NVMe-oF. queued

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ceph-csi-bot @gadididi