From 144239600dfd25bd049a333f4fcf8ed122bfe146 Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Tue, 6 Apr 2021 13:49:54 -0400 Subject: [PATCH] refactor: internal claim methods should be private --- nomad/structs/csi.go | 18 +++++++++--------- nomad/structs/csi_test.go | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nomad/structs/csi.go b/nomad/structs/csi.go index a594071ad..b8b63a642 100644 --- a/nomad/structs/csi.go +++ b/nomad/structs/csi.go @@ -463,17 +463,17 @@ func (v *CSIVolume) Claim(claim *CSIVolumeClaim, alloc *Allocation) error { if claim.State == CSIVolumeClaimStateTaken { switch claim.Mode { case CSIVolumeClaimRead: - return v.ClaimRead(claim, alloc) + return v.claimRead(claim, alloc) case CSIVolumeClaimWrite: - return v.ClaimWrite(claim, alloc) + return v.claimWrite(claim, alloc) } } // either GC or a Unpublish checkpoint - return v.ClaimRelease(claim) + return v.claimRelease(claim) } -// ClaimRead marks an allocation as using a volume read-only -func (v *CSIVolume) ClaimRead(claim *CSIVolumeClaim, alloc *Allocation) error { +// claimRead marks an allocation as using a volume read-only +func (v *CSIVolume) claimRead(claim *CSIVolumeClaim, alloc *Allocation) error { if _, ok := v.ReadAllocs[claim.AllocationID]; ok { return nil } @@ -497,8 +497,8 @@ func (v *CSIVolume) ClaimRead(claim *CSIVolumeClaim, alloc *Allocation) error { return nil } -// ClaimWrite marks an allocation as using a volume as a writer -func (v *CSIVolume) ClaimWrite(claim *CSIVolumeClaim, alloc *Allocation) error { +// claimWrite marks an allocation as using a volume as a writer +func (v *CSIVolume) claimWrite(claim *CSIVolumeClaim, alloc *Allocation) error { if _, ok := v.WriteAllocs[claim.AllocationID]; ok { return nil } @@ -531,9 +531,9 @@ func (v *CSIVolume) ClaimWrite(claim *CSIVolumeClaim, alloc *Allocation) error { return nil } -// ClaimRelease is called when the allocation has terminated and +// claimRelease is called when the allocation has terminated and // already stopped using the volume -func (v *CSIVolume) ClaimRelease(claim *CSIVolumeClaim) error { +func (v *CSIVolume) claimRelease(claim *CSIVolumeClaim) error { if claim.State == CSIVolumeClaimStateReadyToFree { delete(v.ReadAllocs, claim.AllocationID) delete(v.WriteAllocs, claim.AllocationID) diff --git a/nomad/structs/csi_test.go b/nomad/structs/csi_test.go index 35baf3cb0..282a210eb 100644 --- a/nomad/structs/csi_test.go +++ b/nomad/structs/csi_test.go @@ -20,28 +20,28 @@ func TestCSIVolumeClaim(t *testing.T) { Mode: CSIVolumeClaimRead, } - require.NoError(t, vol.ClaimRead(claim, alloc)) + require.NoError(t, vol.claimRead(claim, alloc)) require.True(t, vol.ReadSchedulable()) require.True(t, vol.WriteSchedulable()) - require.NoError(t, vol.ClaimRead(claim, alloc)) + require.NoError(t, vol.claimRead(claim, alloc)) claim.Mode = CSIVolumeClaimWrite - require.NoError(t, vol.ClaimWrite(claim, alloc)) + require.NoError(t, vol.claimWrite(claim, alloc)) require.True(t, vol.ReadSchedulable()) require.False(t, vol.WriteFreeClaims()) - vol.ClaimRelease(claim) + vol.claimRelease(claim) require.True(t, vol.ReadSchedulable()) require.False(t, vol.WriteFreeClaims()) claim.State = CSIVolumeClaimStateReadyToFree - vol.ClaimRelease(claim) + vol.claimRelease(claim) require.True(t, vol.ReadSchedulable()) require.True(t, vol.WriteFreeClaims()) vol.AccessMode = CSIVolumeAccessModeMultiNodeMultiWriter - require.NoError(t, vol.ClaimWrite(claim, alloc)) - require.NoError(t, vol.ClaimWrite(claim, alloc)) + require.NoError(t, vol.claimWrite(claim, alloc)) + require.NoError(t, vol.claimWrite(claim, alloc)) require.True(t, vol.WriteFreeClaims()) }