From 824f7ad9e192c1999fdb5da3a9af8c112904cc66 Mon Sep 17 00:00:00 2001 From: Ryan Russell Date: Fri, 16 Sep 2022 04:43:49 -0500 Subject: [PATCH] refactor(shell): readability improvements (#3704) Signed-off-by: Ryan Russell Signed-off-by: Ryan Russell --- weed/shell/command_fs_configure.go | 2 +- weed/shell/command_lock_unlock.go | 2 +- weed/shell/command_remote_meta_sync.go | 2 +- weed/shell/command_s3_circuitbreaker_test.go | 2 +- weed/shell/command_s3_clean_uploads.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/weed/shell/command_fs_configure.go b/weed/shell/command_fs_configure.go index 1bf42b9ab..60edb79c2 100644 --- a/weed/shell/command_fs_configure.go +++ b/weed/shell/command_fs_configure.go @@ -98,7 +98,7 @@ func (c *commandFsConfigure) Do(args []string, commandEnv *CommandEnv, writer io return fmt.Errorf("parse replication %s: %v", *replication, err) } if *volumeGrowthCount%rp.GetCopyCount() != 0 { - return fmt.Errorf("volumeGrowthCount %d should be devided by replication copy count %d", *volumeGrowthCount, rp.GetCopyCount()) + return fmt.Errorf("volumeGrowthCount %d should be divided by replication copy count %d", *volumeGrowthCount, rp.GetCopyCount()) } } diff --git a/weed/shell/command_lock_unlock.go b/weed/shell/command_lock_unlock.go index a69be21c7..a214ea91c 100644 --- a/weed/shell/command_lock_unlock.go +++ b/weed/shell/command_lock_unlock.go @@ -21,7 +21,7 @@ func (c *commandLock) Name() string { func (c *commandLock) Help() string { return `lock in order to exclusively manage the cluster - This is a blocking operation if there is alread another lock. + This is a blocking operation if there is already another lock. ` } diff --git a/weed/shell/command_remote_meta_sync.go b/weed/shell/command_remote_meta_sync.go index ebd43c326..bc9075746 100644 --- a/weed/shell/command_remote_meta_sync.go +++ b/weed/shell/command_remote_meta_sync.go @@ -96,7 +96,7 @@ After caching the file content, the entry.RemoteEntry will be remoteEntry.LastLocalSyncTsNs == time.Now.UnixNano() Attributes.FileSize = uint64(remoteEntry.RemoteSize) Attributes.Mtime = remoteEntry.RemoteMtime - chunks = non-emtpy + chunks = non-empty When "weed filer.remote.sync" to upload local changes to remote, the criteria is: diff --git a/weed/shell/command_s3_circuitbreaker_test.go b/weed/shell/command_s3_circuitbreaker_test.go index 3d0b4ac6e..d1d92f9f8 100644 --- a/weed/shell/command_s3_circuitbreaker_test.go +++ b/weed/shell/command_s3_circuitbreaker_test.go @@ -285,7 +285,7 @@ func TestCircuitBreakerShell(t *testing.T) { t.Error(err) } if !reflect.DeepEqual(actual, expect) { - t.Fatal("result of s3 circuit breaker shell command is unexpect!") + t.Fatal("result of s3 circuit breaker shell command is unexpected!") } } } diff --git a/weed/shell/command_s3_clean_uploads.go b/weed/shell/command_s3_clean_uploads.go index 831ca47c0..81af4bbb7 100644 --- a/weed/shell/command_s3_clean_uploads.go +++ b/weed/shell/command_s3_clean_uploads.go @@ -60,7 +60,7 @@ func (c *commandS3CleanUploads) Do(args []string, commandEnv *CommandEnv, writer for _, bucket := range buckets { if err := c.cleanupUploads(commandEnv, writer, filerBucketsPath, bucket, *uploadedTimeAgo, signingKey); err != nil { - fmt.Fprintf(writer, fmt.Sprintf("failed cleanup uploads for backet %s: %v", bucket, err)) + fmt.Fprintf(writer, fmt.Sprintf("failed cleanup uploads for bucket %s: %v", bucket, err)) } }