mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-12-18 11:00:25 +00:00
journal: remove SetNamespace setter function
The SetNamespace setter function was called only once, immediately after the creation of a volume journal object in cephfs only. Remove this function so that it is no longer implied that this field can be mutated after the journal is created. In it's place, use an extended "constructor" NewCSIVolumeJournalWithNamespace that takes a namespace value at create-time only. Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
parent
9394ac887e
commit
f091374ba9
@ -110,11 +110,8 @@ func (fs *Driver) Run(conf *util.Config, cachePersister util.CachePersister) {
|
|||||||
CSIInstanceID = conf.InstanceID
|
CSIInstanceID = conf.InstanceID
|
||||||
}
|
}
|
||||||
// Create an instance of the volume journal
|
// Create an instance of the volume journal
|
||||||
volJournal = journal.NewCSIVolumeJournal(CSIInstanceID)
|
volJournal = journal.NewCSIVolumeJournalWithNamespace(CSIInstanceID, radosNamespace)
|
||||||
|
|
||||||
// Update namespace for storing keys into a specific namespace on RADOS, in the CephFS
|
|
||||||
// metadata pool
|
|
||||||
volJournal.SetNamespace(radosNamespace)
|
|
||||||
// Initialize default library driver
|
// Initialize default library driver
|
||||||
|
|
||||||
fs.cd = csicommon.NewCSIDriver(conf.DriverName, util.DriverVersion, conf.NodeID)
|
fs.cd = csicommon.NewCSIDriver(conf.DriverName, util.DriverVersion, conf.NodeID)
|
||||||
|
@ -176,6 +176,14 @@ func NewCSISnapshotJournal(suffix string) *CSIJournal {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewCSIVolumeJournalWithNamespace returns an instance of CSIJournal for
|
||||||
|
// volumes using a predetermined namespace value.
|
||||||
|
func NewCSIVolumeJournalWithNamespace(suffix, ns string) *CSIJournal {
|
||||||
|
j := NewCSIVolumeJournal(suffix)
|
||||||
|
j.namespace = ns
|
||||||
|
return j
|
||||||
|
}
|
||||||
|
|
||||||
// GetNameForUUID returns volume name
|
// GetNameForUUID returns volume name
|
||||||
func (cj *CSIJournal) GetNameForUUID(prefix, uid string, isSnapshot bool) string {
|
func (cj *CSIJournal) GetNameForUUID(prefix, uid string, isSnapshot bool) string {
|
||||||
if prefix == "" {
|
if prefix == "" {
|
||||||
@ -188,11 +196,6 @@ func (cj *CSIJournal) GetNameForUUID(prefix, uid string, isSnapshot bool) string
|
|||||||
return prefix + uid
|
return prefix + uid
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetNamespace sets the namespace in which all RADOS objects would be created
|
|
||||||
func (cj *CSIJournal) SetNamespace(ns string) {
|
|
||||||
cj.namespace = ns
|
|
||||||
}
|
|
||||||
|
|
||||||
// ImageData contains image name and stored CSI properties
|
// ImageData contains image name and stored CSI properties
|
||||||
type ImageData struct {
|
type ImageData struct {
|
||||||
ImageUUID string
|
ImageUUID string
|
||||||
|
Loading…
Reference in New Issue
Block a user