diff options
| author | j.laycock <joseph.laycock@4sightimaging.com> | 2019-09-03 17:00:59 +0100 |
|---|---|---|
| committer | j.laycock <joseph.laycock@4sightimaging.com> | 2019-09-03 17:00:59 +0100 |
| commit | 1f01eb78e81454c54569d8c7baaca115982a87c2 (patch) | |
| tree | 93718397d25eef7bc6f22136deb091f195a2c6f5 /weed/command | |
| parent | d637d86d22f6f4033d931dd59aa86233521246a4 (diff) | |
| download | seaweedfs-1f01eb78e81454c54569d8c7baaca115982a87c2.tar.xz seaweedfs-1f01eb78e81454c54569d8c7baaca115982a87c2.zip | |
Rename mem_map to mMap, remove some in_memory variables being passed around, added MemoryMapped member to volume struct
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/backup.go | 2 | ||||
| -rw-r--r-- | weed/command/compact.go | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/weed/command/backup.go b/weed/command/backup.go index 64924c3c6..65d2a745b 100644 --- a/weed/command/backup.go +++ b/weed/command/backup.go @@ -119,7 +119,7 @@ func runBackup(cmd *Command, args []string) bool { } if v.SuperBlock.CompactionRevision < uint16(stats.CompactRevision) { - if err = v.Compact(0, 0, false); err != nil { + if err = v.Compact(0, 0); err != nil { fmt.Printf("Compact Volume before synchronizing %v\n", err) return true } diff --git a/weed/command/compact.go b/weed/command/compact.go index 7a61f0b95..f10b0b2bc 100644 --- a/weed/command/compact.go +++ b/weed/command/compact.go @@ -26,7 +26,6 @@ var ( compactVolumeId = cmdCompact.Flag.Int("volumeId", -1, "a volume id. The volume should already exist in the dir.") compactMethod = cmdCompact.Flag.Int("method", 0, "option to choose which compact method. use 0 or 1.") compactVolumePreallocate = cmdCompact.Flag.Int64("preallocateMB", 0, "preallocate volume disk space") - compactVolumeInMemory = cmdCompact.Flag.Bool("volumeInMemory", false, "create the volume in memory") ) func runCompact(cmd *Command, args []string) bool { @@ -36,16 +35,15 @@ func runCompact(cmd *Command, args []string) bool { } preallocate := *compactVolumePreallocate * (1 << 20) - inMemory := *compactVolumeInMemory vid := needle.VolumeId(*compactVolumeId) v, err := storage.NewVolume(*compactVolumePath, *compactVolumeCollection, vid, - storage.NeedleMapInMemory, nil, nil, preallocate, inMemory) + storage.NeedleMapInMemory, nil, nil, preallocate, false) if err != nil { glog.Fatalf("Load Volume [ERROR] %s\n", err) } if *compactMethod == 0 { - if err = v.Compact(preallocate, 0, inMemory); err != nil { + if err = v.Compact(preallocate, 0); err != nil { glog.Fatalf("Compact Volume [ERROR] %s\n", err) } } else { |