gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: concurrentFiles and concurrentChunks var name fix (#3655)

Browse Source
This commit is contained in:
Ryan Russell
2022-09-14 06:53:04 -05:00
committed by GitHub
parent ba83dbda6f
commit 60fa26ef45
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
weed/command/filer_copy.go
View File

@@ -38,8 +38,8 @@ type CopyOptions struct {
diskType *string diskType *string
maxMB *int maxMB *int
masterClient *wdclient.MasterClient masterClient *wdclient.MasterClient
concurrenctFiles *int concurrentFiles *int
concurrenctChunks *int concurrentChunks *int
grpcDialOption grpc.DialOption grpcDialOption grpc.DialOption
masters []string masters []string
cipher bool cipher bool
@@ -57,8 +57,8 @@ func init() {
copy.ttl = cmdFilerCopy.Flag.String("ttl", "", "time to live, e.g.: 1m, 1h, 1d, 1M, 1y") copy.ttl = cmdFilerCopy.Flag.String("ttl", "", "time to live, e.g.: 1m, 1h, 1d, 1M, 1y")
copy.diskType = cmdFilerCopy.Flag.String("disk", "", "[hdd|ssd|<tag>] hard drive or solid state drive or any tag") copy.diskType = cmdFilerCopy.Flag.String("disk", "", "[hdd|ssd|<tag>] hard drive or solid state drive or any tag")
copy.maxMB = cmdFilerCopy.Flag.Int("maxMB", 4, "split files larger than the limit") copy.maxMB = cmdFilerCopy.Flag.Int("maxMB", 4, "split files larger than the limit")
copy.concurrenctFiles = cmdFilerCopy.Flag.Int("c", 8, "concurrent file copy goroutines") copy.concurrentFiles = cmdFilerCopy.Flag.Int("c", 8, "concurrent file copy goroutines")
copy.concurrenctChunks = cmdFilerCopy.Flag.Int("concurrentChunks", 8, "concurrent chunk copy goroutines for each file") copy.concurrentChunks = cmdFilerCopy.Flag.Int("concurrentChunks", 8, "concurrent chunk copy goroutines for each file")
copy.checkSize = cmdFilerCopy.Flag.Bool("check.size", false, "copy when the target file size is different from the source file") copy.checkSize = cmdFilerCopy.Flag.Bool("check.size", false, "copy when the target file size is different from the source file")
copy.verbose = cmdFilerCopy.Flag.Bool("verbose", false, "print out details during copying") copy.verbose = cmdFilerCopy.Flag.Bool("verbose", false, "print out details during copying")
} }
@@ -141,7 +141,7 @@ func runCopy(cmd *Command, args []string) bool {
grace.SetupProfiling("filer.copy.cpu.pprof", "filer.copy.mem.pprof") grace.SetupProfiling("filer.copy.cpu.pprof", "filer.copy.mem.pprof")
} }
fileCopyTaskChan := make(chan FileCopyTask, *copy.concurrenctFiles) fileCopyTaskChan := make(chan FileCopyTask, *copy.concurrentFiles)
go func() { go func() {
defer close(fileCopyTaskChan) defer close(fileCopyTaskChan)
@@ -152,7 +152,7 @@ func runCopy(cmd *Command, args []string) bool {
} }
} }
}() }()
for i := 0; i < *copy.concurrenctFiles; i++ { for i := 0; i < *copy.concurrentFiles; i++ {
waitGroup.Add(1) waitGroup.Add(1)
go func() { go func() {
defer waitGroup.Done() defer waitGroup.Done()
@@ -405,7 +405,7 @@ func (worker *FileCopyWorker) uploadFileInChunks(task FileCopyTask, f *os.File,
chunksChan := make(chan *filer_pb.FileChunk, chunkCount) chunksChan := make(chan *filer_pb.FileChunk, chunkCount)
concurrentChunks := make(chan struct{}, *worker.options.concurrenctChunks) concurrentChunks := make(chan struct{}, *worker.options.concurrentChunks)
var wg sync.WaitGroup var wg sync.WaitGroup
var uploadError error var uploadError error