This commit is contained in:
Chris Lu 2018-10-14 00:30:20 -07:00
parent 249eeccf32
commit 91ac2e0dd9
7 changed files with 11 additions and 12 deletions

View file

@ -10,8 +10,8 @@ import (
"sync" "sync"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util"
) )
var ( var (

View file

@ -1,15 +1,14 @@
package operation package operation
import ( import (
"context"
"errors" "errors"
"fmt"
"net/http"
"strings" "strings"
"sync" "sync"
"net/http"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"context"
"fmt"
) )
type DeleteResult struct { type DeleteResult struct {

View file

@ -2,12 +2,12 @@ package operation
import ( import (
"fmt" "fmt"
"strings"
"strconv" "strconv"
"strings"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
) )

View file

@ -1,6 +1,7 @@
package operation package operation
import ( import (
"context"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
@ -9,9 +10,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"context" "github.com/chrislusf/seaweedfs/weed/util"
) )
type Location struct { type Location struct {

View file

@ -19,8 +19,8 @@ import (
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
_ "github.com/chrislusf/seaweedfs/weed/statik" _ "github.com/chrislusf/seaweedfs/weed/statik"
statik "github.com/rakyll/statik/fs"
"github.com/gorilla/mux" "github.com/gorilla/mux"
statik "github.com/rakyll/statik/fs"
) )
var serverStats *stats.ServerStats var serverStats *stats.ServerStats

View file

@ -1,8 +1,9 @@
package weed_server package weed_server
import ( import (
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"context" "context"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
) )
func (ms *MasterServer) LookupVolume(ctx context.Context, req *master_pb.LookupVolumeRequest) (*master_pb.LookupVolumeResponse, error) { func (ms *MasterServer) LookupVolume(ctx context.Context, req *master_pb.LookupVolumeRequest) (*master_pb.LookupVolumeResponse, error) {

View file

@ -66,7 +66,6 @@ func (vc *vidMap) LookupVolumeServer(fileId string) (volumeServer string, err er
return serverUrl, nil return serverUrl, nil
} }
func (vc *vidMap) GetLocations(vid uint32) (locations []Location) { func (vc *vidMap) GetLocations(vid uint32) (locations []Location) {
vc.RLock() vc.RLock()
defer vc.RUnlock() defer vc.RUnlock()