Browse Source

Merge pull request #8 from chrislusf/master

merge seaweed master
pull/1087/head
joeslay 5 years ago
committed by GitHub
parent
commit
9d03aa6a38
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      unmaintained/load_test/load_test_leveldb/load_test_leveldb.go
  2. 7
      unmaintained/remove_duplicate_fids/remove_duplicate_fids.go
  3. 4
      unmaintained/see_dat/see_dat.go
  4. 5
      weed/s3api/filer_multipart.go
  5. 2
      weed/s3api/s3api_objects_list_handlers.go
  6. 2
      weed/s3api/s3api_xsd_generated.go
  7. 4
      weed/server/master_server_handlers.go
  8. 4
      weed/shell/command_volume_list.go

1
unmaintained/load_test/load_test_leveldb/load_test_leveldb.go

@ -67,7 +67,6 @@ func main() {
}(d) }(d)
} }
counter := int64(0) counter := int64(0)
lastResetTime := time.Now() lastResetTime := time.Now()

7
unmaintained/remove_duplicate_fids/remove_duplicate_fids.go

@ -2,14 +2,13 @@ package main
import ( import (
"flag" "flag"
"fmt"
"os"
"path/filepath"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/storage/needle"
"os"
"path/filepath"
"fmt"
) )
var ( var (

4
unmaintained/see_dat/see_dat.go

@ -2,12 +2,11 @@ package main
import ( import (
"flag" "flag"
"time"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/storage/needle"
"time"
) )
var ( var (
@ -45,5 +44,4 @@ func main() {
if err != nil { if err != nil {
glog.Fatalf("Reading Volume File [ERROR] %s\n", err) glog.Fatalf("Reading Volume File [ERROR] %s\n", err)
} }
} }

5
weed/s3api/filer_multipart.go

@ -91,6 +91,11 @@ func (s3a *S3ApiServer) completeMultipartUpload(ctx context.Context, input *s3.C
} }
dirName = fmt.Sprintf("%s/%s/%s", s3a.option.BucketsPath, *input.Bucket, dirName) dirName = fmt.Sprintf("%s/%s/%s", s3a.option.BucketsPath, *input.Bucket, dirName)
// remove suffix '/'
if strings.HasSuffix(dirName, "/") {
dirName = dirName[:len(dirName)-1]
}
err = s3a.mkFile(ctx, dirName, entryName, finalParts) err = s3a.mkFile(ctx, dirName, entryName, finalParts)
if err != nil { if err != nil {

2
weed/s3api/s3api_objects_list_handlers.go

@ -125,9 +125,11 @@ func (s3a *S3ApiServer) listFilerEntries(ctx context.Context, bucket, originalPr
} }
lastEntryName = entry.Name lastEntryName = entry.Name
if entry.IsDirectory { if entry.IsDirectory {
if entry.Name != ".uploads" {
commonPrefixes = append(commonPrefixes, PrefixEntry{ commonPrefixes = append(commonPrefixes, PrefixEntry{
Prefix: fmt.Sprintf("%s%s/", dir, entry.Name), Prefix: fmt.Sprintf("%s%s/", dir, entry.Name),
}) })
}
} else { } else {
contents = append(contents, ListEntry{ contents = append(contents, ListEntry{
Key: fmt.Sprintf("%s%s", dir, entry.Name), Key: fmt.Sprintf("%s%s", dir, entry.Name),

2
weed/s3api/s3api_xsd_generated.go

@ -675,7 +675,7 @@ type PostResponse struct {
} }
type PrefixEntry struct { type PrefixEntry struct {
Prefix string `xml:"http://s3.amazonaws.com/doc/2006-03-01/ Prefix"`
Prefix string `xml:"Prefix"`
} }
type PutObject struct { type PutObject struct {

4
weed/server/master_server_handlers.go

@ -48,7 +48,7 @@ func (ms *MasterServer) dirLookupHandler(w http.ResponseWriter, r *http.Request)
collection := r.FormValue("collection") //optional, but can be faster if too many collections collection := r.FormValue("collection") //optional, but can be faster if too many collections
location := ms.findVolumeLocation(collection, vid) location := ms.findVolumeLocation(collection, vid)
httpStatus := http.StatusOK httpStatus := http.StatusOK
if location.Error != "" {
if location.Error != "" || location.Locations == nil {
httpStatus = http.StatusNotFound httpStatus = http.StatusNotFound
} else { } else {
forRead := r.FormValue("read") forRead := r.FormValue("read")
@ -60,7 +60,7 @@ func (ms *MasterServer) dirLookupHandler(w http.ResponseWriter, r *http.Request)
// findVolumeLocation finds the volume location from master topo if it is leader, // findVolumeLocation finds the volume location from master topo if it is leader,
// or from master client if not leader // or from master client if not leader
func (ms *MasterServer) findVolumeLocation(collection string, vid string) operation.LookupResult {
func (ms *MasterServer) findVolumeLocation(collection, vid string) operation.LookupResult {
var locations []operation.Location var locations []operation.Location
var err error var err error
if ms.Topo.IsLeader() { if ms.Topo.IsLeader() {

4
weed/shell/command_volume_list.go

@ -98,7 +98,7 @@ func writeDataNodeInfo(writer io.Writer, t *master_pb.DataNodeInfo) statistics {
} }
func writeVolumeInformationMessage(writer io.Writer, t *master_pb.VolumeInformationMessage) statistics { func writeVolumeInformationMessage(writer io.Writer, t *master_pb.VolumeInformationMessage) statistics {
fmt.Fprintf(writer, " volume %+v \n", t) fmt.Fprintf(writer, " volume %+v \n", t)
return newStatiscis(t)
return newStatistics(t)
} }
type statistics struct { type statistics struct {
@ -108,7 +108,7 @@ type statistics struct {
DeletedBytes uint64 DeletedBytes uint64
} }
func newStatiscis(t *master_pb.VolumeInformationMessage) statistics {
func newStatistics(t *master_pb.VolumeInformationMessage) statistics {
return statistics{ return statistics{
Size: t.Size, Size: t.Size,
FileCount: t.FileCount, FileCount: t.FileCount,

Loading…
Cancel
Save