gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/chrislusf/seaweedfs

Browse source
This commit is contained in:
Chris Lu 2019-02-09 12:52:12 -08:00
parent 8afc632484 820bb05182
commit 729d71fd4c
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/command/backup.go
View file

@ -41,7 +41,7 @@ var cmdBackup = &Command{
But it's tricky to incrementally copy the differences. But it's tricky to incrementally copy the differences.
The complexity comes when there are multiple addition, deletion and compaction. The complexity comes when there are multiple addition, deletion and compaction.
This tool will handle them correctly and efficiently, avoiding unnecessary data transporation. This tool will handle them correctly and efficiently, avoiding unnecessary data transportation.
`, `,
} }

2
weed/command/upload.go
View file

@ -53,7 +53,7 @@ var cmdUpload = &Command{
All files under the folder and subfolders will be uploaded, each with its own file key. All files under the folder and subfolders will be uploaded, each with its own file key.
Optional parameter "-include" allows you to specify the file name patterns. Optional parameter "-include" allows you to specify the file name patterns.
If "maxMB" is set to a positive number, files larger than it would be split into chunks and uploaded separatedly. If "maxMB" is set to a positive number, files larger than it would be split into chunks and uploaded separately.
The list of file ids of those chunks would be stored in an additional chunk, and this additional chunk's file id would be returned. The list of file ids of those chunks would be stored in an additional chunk, and this additional chunk's file id would be returned.
`, `,

2
weed/operation/compress.go
View file

@ -30,7 +30,7 @@ func IsGzippable(ext, mtype string, data []byte) bool {
return false return false
} }
// by file name extention // by file name extension
switch ext { switch ext {
case ".zip", ".rar", ".gz", ".bz2", ".xz": case ".zip", ".rar", ".gz", ".bz2", ".xz":
return false return false

2
weed/security/guard.go
View file

@ -158,5 +158,5 @@ func (g *Guard) checkJwt(w http.ResponseWriter, r *http.Request) error {
} }
glog.V(1).Infof("No permission from %s", r.RemoteAddr) glog.V(1).Infof("No permission from %s", r.RemoteAddr)
return fmt.Errorf("No write permisson from %s", r.RemoteAddr) return fmt.Errorf("No write permission from %s", r.RemoteAddr)
} }

4
weed/topology/topology_vacuum.go
View file

@ -82,7 +82,7 @@ func batchVacuumVolumeCompact(vl *VolumeLayout, vid storage.VolumeId, locationli
func batchVacuumVolumeCommit(vl *VolumeLayout, vid storage.VolumeId, locationlist *VolumeLocationList) bool { func batchVacuumVolumeCommit(vl *VolumeLayout, vid storage.VolumeId, locationlist *VolumeLocationList) bool {
isCommitSuccess := true isCommitSuccess := true
for _, dn := range locationlist.list { for _, dn := range locationlist.list {
glog.V(0).Infoln("Start Commiting vacuum", vid, "on", dn.Url()) glog.V(0).Infoln("Start Committing vacuum", vid, "on", dn.Url())
err := operation.WithVolumeServerClient(dn.Url(), func(volumeServerClient volume_server_pb.VolumeServerClient) error { err := operation.WithVolumeServerClient(dn.Url(), func(volumeServerClient volume_server_pb.VolumeServerClient) error {
_, err := volumeServerClient.VacuumVolumeCommit(context.Background(), &volume_server_pb.VacuumVolumeCommitRequest{ _, err := volumeServerClient.VacuumVolumeCommit(context.Background(), &volume_server_pb.VacuumVolumeCommitRequest{
VolumdId: uint32(vid), VolumdId: uint32(vid),
@ -93,7 +93,7 @@ func batchVacuumVolumeCommit(vl *VolumeLayout, vid storage.VolumeId, locationlis
glog.Errorf("Error when committing vacuum %d on %s: %v", vid, dn.Url(), err) glog.Errorf("Error when committing vacuum %d on %s: %v", vid, dn.Url(), err)
isCommitSuccess = false isCommitSuccess = false
} else { } else {
glog.V(0).Infof("Complete Commiting vacuum %d on %s", vid, dn.Url()) glog.V(0).Infof("Complete Committing vacuum %d on %s", vid, dn.Url())
} }
if isCommitSuccess { if isCommitSuccess {
vl.SetVolumeAvailable(dn, vid) vl.SetVolumeAvailable(dn, vid)