mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 11:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal: reformat long lines in internal/journal package to 120 chars

Browse Source 
We have many declarations and invocations..etc with long lines which are
very difficult to follow while doing code reading. This address the issues
in 'internal/journal' package to restrict the line length to 120 chars.

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2021-06-25 16:55:00 +05:30 committed by mergify[bot]
parent a3b83fe8a7
commit 3dc8c5b516
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
internal/journal/voljournal.go
View File

@ -419,7 +419,13 @@ func (conn *Connection) UndoReservation(ctx context.Context,
return fmt.Errorf("failed parsing UUID in %s", volName) return fmt.Errorf("failed parsing UUID in %s", volName)
} }
err := util.RemoveObject(ctx, conn.monitors, conn.cr, volJournalPool, cj.namespace, cj.cephUUIDDirectoryPrefix+imageUUID) err := util.RemoveObject(
ctx,
conn.monitors,
conn.cr,
volJournalPool,
cj.namespace,
cj.cephUUIDDirectoryPrefix+imageUUID)
if err != nil { if err != nil {
if !errors.Is(err, util.ErrObjectNotFound) { if !errors.Is(err, util.ErrObjectNotFound) {
util.ErrorLog(ctx, "failed removing oMap %s (%s)", cj.cephUUIDDirectoryPrefix+imageUUID, err) util.ErrorLog(ctx, "failed removing oMap %s (%s)", cj.cephUUIDDirectoryPrefix+imageUUID, err)
@ -445,7 +451,11 @@ func (conn *Connection) UndoReservation(ctx context.Context,
// already exists.if the passed volUUID is empty It ensures generated omap name // already exists.if the passed volUUID is empty It ensures generated omap name
// does not already exist and if conflicts are detected, a set number of // does not already exist and if conflicts are detected, a set number of
// retires with newer uuids are attempted before returning an error. // retires with newer uuids are attempted before returning an error.
func reserveOMapName(ctx context.Context, monitors string, cr *util.Credentials, pool, namespace, oMapNamePrefix, volUUID string) (string, error) { func reserveOMapName(
ctx context.Context,
monitors string,
cr *util.Credentials,
pool, namespace, oMapNamePrefix, volUUID string) (string, error) {
var iterUUID string var iterUUID string
maxAttempts := 5 maxAttempts := 5
@ -470,7 +480,10 @@ func reserveOMapName(ctx context.Context, monitors string, cr *util.Credentials,
continue continue
} }
return "", fmt.Errorf("failed to create omap object for oMapNamePrefix+iterUUID=%s: %w", oMapNamePrefix+iterUUID, err) return "", fmt.Errorf(
"failed to create omap object for oMapNamePrefix+iterUUID=%s: %w",
oMapNamePrefix+iterUUID,
err)
} }
return iterUUID, nil return iterUUID, nil
@ -530,7 +543,14 @@ func (conn *Connection) ReserveName(ctx context.Context,
// NOTE: If any service loss occurs post creation of the UUID directory, and before // NOTE: If any service loss occurs post creation of the UUID directory, and before
// setting the request name key (csiNameKey) to point back to the UUID directory, the // setting the request name key (csiNameKey) to point back to the UUID directory, the
// UUID directory key will be leaked // UUID directory key will be leaked
volUUID, err = reserveOMapName(ctx, conn.monitors, conn.cr, imagePool, cj.namespace, cj.cephUUIDDirectoryPrefix, volUUID) volUUID, err = reserveOMapName(
ctx,
conn.monitors,
conn.cr,
imagePool,
cj.namespace,
cj.cephUUIDDirectoryPrefix,
volUUID)
if err != nil { if err != nil {
return "", "", err return "", "", err
} }
@ -618,7 +638,10 @@ type ImageAttributes struct {
} }
// GetImageAttributes fetches all keys and their values, from a UUID directory, returning ImageAttributes structure. // GetImageAttributes fetches all keys and their values, from a UUID directory, returning ImageAttributes structure.
func (conn *Connection) GetImageAttributes(ctx context.Context, pool, objectUUID string, snapSource bool) (*ImageAttributes, error) { func (conn *Connection) GetImageAttributes(
ctx context.Context,
pool, objectUUID string,
snapSource bool) (*ImageAttributes, error) {
var ( var (
err error err error
imageAttributes *ImageAttributes = &ImageAttributes{} imageAttributes *ImageAttributes = &ImageAttributes{}