mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-14 02:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: add CSIDriver.GetInstanceID()

Browse Source 
There has been some confusion about using different variables for the
InstanceID of the RBD-driver. By removing the global variable
CSIInstanceID, there should be no confusion anymore what variable to
use.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos
2024-08-02 15:19:02 +02:00
committed by mergify[bot]
parent 0092a47586
commit dfb48bac17
9 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/rbd/rbd_journal.go
View File

@ -547,7 +547,8 @@ func RegenerateJournal(
volumeID,
requestName,
owner,
clusterName string,
clusterName,
instanceID string,
setMetadata bool,
cr *util.Credentials,
) (string, error) {
@ -595,7 +596,7 @@ func RegenerateJournal(
if rbdVol.JournalPool == "" {
rbdVol.JournalPool = rbdVol.Pool
}
volJournal = journal.NewCSIVolumeJournal(CSIInstanceID)
volJournal = journal.NewCSIVolumeJournal(instanceID)
j, err := volJournal.Connect(rbdVol.Monitors, rbdVol.RadosNamespace, cr)
if err != nil {
return "", err