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

master api: return http 404 when volumeId not exist

Browse source 
Signed-off-by: Lei Liu <lei01.liu@horizon.ai>
This commit is contained in:
Lei Liu 2019-09-29 14:17:37 +08:00
parent 972e881d48
commit 3cc084269c
6 changed files with 65 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
unmaintained/load_test/load_test_leveldb/load_test_leveldb.go
View file

@ -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
View file

@ -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
View file

@ -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)
} }
} }

4
weed/server/master_server_handlers.go
View file

@ -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
View file

@ -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,