aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Russell <ryanrussell@users.noreply.github.com>2022-09-16 04:43:17 -0500
committerGitHub <noreply@github.com>2022-09-16 02:43:17 -0700
commit277976bd762a108d6b6f7f96500a769c5454549d (patch)
tree0a44f42bcfff5c12f79186ccbd8a8d7b236668d5
parentd949a238b83dc05fe79a1fb02a047a25355feb7b (diff)
downloadseaweedfs-277976bd762a108d6b6f7f96500a769c5454549d.tar.xz
seaweedfs-277976bd762a108d6b6f7f96500a769c5454549d.zip
refactor(storage): readability improvements (#3703)
Signed-off-by: Ryan Russell <git@ryanrussell.org> Signed-off-by: Ryan Russell <git@ryanrussell.org>
-rw-r--r--weed/storage/backend/memory_map/memory_map_windows.go2
-rw-r--r--weed/storage/needle/file_id_test.go2
-rw-r--r--weed/storage/needle/needle_parse_upload.go2
-rw-r--r--weed/storage/needle/needle_write.go2
-rw-r--r--weed/storage/store.go2
-rw-r--r--weed/storage/store_ec.go2
-rw-r--r--weed/storage/store_vacuum.go2
-rw-r--r--weed/storage/volume_vacuum.go2
-rw-r--r--weed/storage/volume_write.go2
9 files changed, 9 insertions, 9 deletions
diff --git a/weed/storage/backend/memory_map/memory_map_windows.go b/weed/storage/backend/memory_map/memory_map_windows.go
index b65e1b20a..ce0c04318 100644
--- a/weed/storage/backend/memory_map/memory_map_windows.go
+++ b/weed/storage/backend/memory_map/memory_map_windows.go
@@ -153,7 +153,7 @@ func allocate(hMapFile windows.Handle, offset uint64, length uint64, write bool)
mBuffer := MemoryBuffer{}
- //align memory allocations to the minium virtal memory allocation size
+ //align memory allocations to the minium virtual memory allocation size
dwSysGran := systemInfo.dwAllocationGranularity
start := (offset / uint64(dwSysGran)) * uint64(dwSysGran)
diff --git a/weed/storage/needle/file_id_test.go b/weed/storage/needle/file_id_test.go
index ee5175d39..2796470aa 100644
--- a/weed/storage/needle/file_id_test.go
+++ b/weed/storage/needle/file_id_test.go
@@ -15,7 +15,7 @@ func TestParseFileIdFromString(t *testing.T) {
fidStr1 = "100, 12345678"
_, err = ParseFileIdFromString(fidStr1)
if err == nil {
- t.Errorf("%s : needlId invalid syntax", fidStr1)
+ t.Errorf("%s : needleId invalid syntax", fidStr1)
}
fidStr1 = "100,123456789"
diff --git a/weed/storage/needle/needle_parse_upload.go b/weed/storage/needle/needle_parse_upload.go
index e733cfb99..e00729811 100644
--- a/weed/storage/needle/needle_parse_upload.go
+++ b/weed/storage/needle/needle_parse_upload.go
@@ -195,7 +195,7 @@ func parseMultipart(r *http.Request, sizeLimit int64, pu *ParsedUpload) (e error
}
contentType := part.Header.Get("Content-Type")
if contentType != "" && contentType != "application/octet-stream" && mtype != contentType {
- pu.MimeType = contentType // only return mime type if not deductable
+ pu.MimeType = contentType // only return mime type if not deducible
mtype = contentType
}
diff --git a/weed/storage/needle/needle_write.go b/weed/storage/needle/needle_write.go
index a562417df..60b6e7adb 100644
--- a/weed/storage/needle/needle_write.go
+++ b/weed/storage/needle/needle_write.go
@@ -128,7 +128,7 @@ func (n *Needle) Append(w backend.BackendStorageFile, version Version) (offset u
return
}
if offset >= MaxPossibleVolumeSize && n.Size.IsValid() {
- err = fmt.Errorf("Volume Size %d Exeededs %d", offset, MaxPossibleVolumeSize)
+ err = fmt.Errorf("Volume Size %d Exceeded %d", offset, MaxPossibleVolumeSize)
return
}
diff --git a/weed/storage/store.go b/weed/storage/store.go
index 45f87525b..76be2fa9c 100644
--- a/weed/storage/store.go
+++ b/weed/storage/store.go
@@ -62,7 +62,7 @@ type Store struct {
GrpcPort int
PublicUrl string
Locations []*DiskLocation
- dataCenter string // optional informaton, overwriting master setting if exists
+ dataCenter string // optional information, overwriting master setting if exists
rack string // optional information, overwriting master setting if exists
connected bool
NeedleMapKind NeedleMapKind
diff --git a/weed/storage/store_ec.go b/weed/storage/store_ec.go
index 8d7e890b3..b46803fb2 100644
--- a/weed/storage/store_ec.go
+++ b/weed/storage/store_ec.go
@@ -339,7 +339,7 @@ func (s *Store) recoverOneRemoteEcShardInterval(needleId types.NeedleId, ecVolum
ecVolume.ShardLocationsLock.RLock()
for shardId, locations := range ecVolume.ShardLocations {
- // skip currnent shard or empty shard
+ // skip current shard or empty shard
if shardId == shardIdToRecover {
continue
}
diff --git a/weed/storage/store_vacuum.go b/weed/storage/store_vacuum.go
index e8db7d7cd..0f25c888a 100644
--- a/weed/storage/store_vacuum.go
+++ b/weed/storage/store_vacuum.go
@@ -10,7 +10,7 @@ import (
func (s *Store) CheckCompactVolume(volumeId needle.VolumeId) (float64, error) {
if v := s.findVolume(volumeId); v != nil {
- glog.V(3).Infof("volumd %d garbage level: %f", volumeId, v.garbageLevel())
+ glog.V(3).Infof("volume %d garbage level: %f", volumeId, v.garbageLevel())
return v.garbageLevel(), nil
}
return 0, fmt.Errorf("volume id %d is not found during check compact", volumeId)
diff --git a/weed/storage/volume_vacuum.go b/weed/storage/volume_vacuum.go
index 642b3eab5..2862ca94d 100644
--- a/weed/storage/volume_vacuum.go
+++ b/weed/storage/volume_vacuum.go
@@ -167,7 +167,7 @@ func (v *Volume) CommitCompact() error {
if e = v.load(true, false, v.needleMapKind, 0); e != nil {
return e
}
- glog.V(3).Infof("Finish commiting volume %d", v.Id)
+ glog.V(3).Infof("Finish committing volume %d", v.Id)
return nil
}
diff --git a/weed/storage/volume_write.go b/weed/storage/volume_write.go
index 49022cc0a..223e19577 100644
--- a/weed/storage/volume_write.go
+++ b/weed/storage/volume_write.go
@@ -81,7 +81,7 @@ func removeVolumeFiles(filename string) {
// compaction
os.Remove(filename + ".cpd")
os.Remove(filename + ".cpx")
- // level db indx file
+ // level db index file
os.RemoveAll(filename + ".ldb")
// marker for damaged or incomplete volume
os.Remove(filename + ".note")