From eb447f5b0a95f244d117bd178b1852b675d2bb55 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Mon, 27 Jun 2022 15:28:00 +0200 Subject: [PATCH] proper naming Signed-off-by: jkoberg --- pkg/storage/utils/decomposedfs/decomposedfs.go | 6 +++--- pkg/storage/utils/decomposedfs/node/node.go | 6 +++--- pkg/storage/utils/decomposedfs/options/options.go | 2 +- pkg/storage/utils/decomposedfs/upload/postprocessing.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/storage/utils/decomposedfs/decomposedfs.go b/pkg/storage/utils/decomposedfs/decomposedfs.go index 16b2e605ef..1bdde84a51 100644 --- a/pkg/storage/utils/decomposedfs/decomposedfs.go +++ b/pkg/storage/utils/decomposedfs/decomposedfs.go @@ -504,15 +504,15 @@ func (fs *Decomposedfs) GetMD(ctx context.Context, ref *provider.Reference, mdKe return } - isprocessed := node.IsProcessed() - if !isprocessed && !node.Exists { + isprocessing := node.IsProcessing() + if !isprocessing && !node.Exists { err = errtypes.NotFound(filepath.Join(node.ParentID, node.Name)) return } rp, err := fs.p.AssemblePermissions(ctx, node) switch { - case isprocessed: + case isprocessing: // FIXME: how to check permissions for files while processing? // the node is empty and holds no further information case err != nil: diff --git a/pkg/storage/utils/decomposedfs/node/node.go b/pkg/storage/utils/decomposedfs/node/node.go index cfd7b33b6c..d5da711c07 100644 --- a/pkg/storage/utils/decomposedfs/node/node.go +++ b/pkg/storage/utils/decomposedfs/node/node.go @@ -641,7 +641,7 @@ func (n *Node) AsResourceInfo(ctx context.Context, rp *provider.ResourcePermissi ParentId: parentID, } - if n.IsProcessed() { + if n.IsProcessing() { ri.Opaque = utils.AppendPlainToOpaque(ri.Opaque, "status", "processing") return ri, nil } @@ -1139,8 +1139,8 @@ func (n *Node) UnmarkProcessing() error { return n.RemoveMetadata("user.ocis.nodestatus") } -// IsProcessed returns true if the node is currently being processed -func (n *Node) IsProcessed() bool { +// IsProcessing returns true if the node is currently being processed +func (n *Node) IsProcessing() bool { v, err := n.GetMetadata("user.ocis.nodestatus") return err == nil && v == "processing" } diff --git a/pkg/storage/utils/decomposedfs/options/options.go b/pkg/storage/utils/decomposedfs/options/options.go index 1b99d26abd..ce65655b6a 100644 --- a/pkg/storage/utils/decomposedfs/options/options.go +++ b/pkg/storage/utils/decomposedfs/options/options.go @@ -58,7 +58,7 @@ type Options struct { // PostprocessingOptions defines the available options for postprocessing type PostprocessingOptions struct { - ASyncFileUploads bool `mapstructure:"asyncfileuploads"` + AsyncFileUploads bool `mapstructure:"asyncfileuploads"` DelayProcessing time.Duration `mapstructure:"delayprocessing"` // for testing purposes, or if you want to annoy your users } diff --git a/pkg/storage/utils/decomposedfs/upload/postprocessing.go b/pkg/storage/utils/decomposedfs/upload/postprocessing.go index 83e03f61db..9e89db8beb 100644 --- a/pkg/storage/utils/decomposedfs/upload/postprocessing.go +++ b/pkg/storage/utils/decomposedfs/upload/postprocessing.go @@ -27,7 +27,7 @@ import ( func configurePostprocessing(upload *Upload, o options.PostprocessingOptions) postprocessing.Postprocessing { waitfor := []string{"initialize"} - if !o.ASyncFileUploads { + if !o.AsyncFileUploads { waitfor = append(waitfor, "assembling") }