diff options
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_ui/filer.html | 12 | ||||
| -rw-r--r-- | weed/server/master_grpc_server.go | 2 | ||||
| -rw-r--r-- | weed/server/volume_grpc_admin.go | 10 | ||||
| -rw-r--r-- | weed/server/volume_grpc_client_to_master.go | 24 |
4 files changed, 21 insertions, 27 deletions
diff --git a/weed/server/filer_ui/filer.html b/weed/server/filer_ui/filer.html index 785f82887..f9c35440e 100644 --- a/weed/server/filer_ui/filer.html +++ b/weed/server/filer_ui/filer.html @@ -225,6 +225,10 @@ handleFiles(files); } + function reloadPage() { + window.location.reload(true); + } + var uploadList = {}; function handleFiles(files) { @@ -277,7 +281,7 @@ } if (allFinish) { console.log('All Finish'); - window.location.reload(); + reloadPage(); } } @@ -318,7 +322,7 @@ xhr.open('POST', url, false); xhr.setRequestHeader('Content-Type', ''); xhr.send(); - window.location.reload(); + reloadPage(); } function handleRename(originName, basePath) { @@ -333,7 +337,7 @@ xhr.open('POST', url, false); xhr.setRequestHeader('Content-Type', ''); xhr.send(); - window.location.reload(); + reloadPage(); } function handleDelete(path) { @@ -348,7 +352,7 @@ var xhr = new XMLHttpRequest(); xhr.open('DELETE', url, false); xhr.send(); - window.location.reload(); + reloadPage(); } </script> </html> diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 0cdcd33cb..4d0fbbc41 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -113,7 +113,7 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ uuidlist, err := ms.RegisterUuids(heartbeat) if err != nil { if stream_err := stream.Send(&master_pb.HeartbeatResponse{ - DuplicatedUuids: uuidlist, + DuplicatedUuids: uuidlist, }); stream_err != nil { glog.Warningf("SendHeartbeat.Send DuplicatedDirectory response to %s:%d %v", dn.Ip, dn.Port, stream_err) return stream_err diff --git a/weed/server/volume_grpc_admin.go b/weed/server/volume_grpc_admin.go index 476937847..2ffdf2226 100644 --- a/weed/server/volume_grpc_admin.go +++ b/weed/server/volume_grpc_admin.go @@ -7,6 +7,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/master_pb" + "github.com/chrislusf/seaweedfs/weed/util" "path/filepath" "time" @@ -188,7 +189,12 @@ func (vs *VolumeServer) VolumeStatus(ctx context.Context, req *volume_server_pb. func (vs *VolumeServer) VolumeServerStatus(ctx context.Context, req *volume_server_pb.VolumeServerStatusRequest) (*volume_server_pb.VolumeServerStatusResponse, error) { - resp := &volume_server_pb.VolumeServerStatusResponse{} + resp := &volume_server_pb.VolumeServerStatusResponse{ + MemoryStatus: stats.MemStat(), + Version: util.Version(), + DataCenter: vs.dataCenter, + Rack: vs.rack, + } for _, loc := range vs.store.Locations { if dir, e := filepath.Abs(loc.Directory); e == nil { @@ -196,8 +202,6 @@ func (vs *VolumeServer) VolumeServerStatus(ctx context.Context, req *volume_serv } } - resp.MemoryStatus = stats.MemStat() - return resp, nil } diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index a7b75d6a5..078b78eb2 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -119,30 +119,16 @@ func (vs *VolumeServer) doHeartbeat(masterAddress pb.ServerAddress, grpcDialOpti return } if len(in.DuplicatedUuids) > 0 { - var duplicatedDir []string - - foundDuplicate := false - duplicateSet := make(map[string]struct{}) + var duplicateDir []string for _, loc := range vs.store.Locations { - directoryUuid := loc.DirectoryUuid - if _, exists := duplicateSet[directoryUuid]; !exists { - duplicateSet[directoryUuid] = struct{}{} - } else { - foundDuplicate = true - } - for _, uuid := range in.DuplicatedUuids { - if uuid == directoryUuid { - duplicatedDir = append(duplicatedDir, loc.Directory) + if uuid == loc.DirectoryUuid { + duplicateDir = append(duplicateDir, loc.Directory) } } } - if foundDuplicate { - glog.Errorf("Shut down Volume Server due to duplicated volume directories: %v", duplicatedDir) - os.Exit(1) - } else { - glog.Warningf("Receive response of duplicated volume directories: %v, ignored(the check found no duplicates)", duplicatedDir) - } + glog.Errorf("Shut down Volume Server due to duplicate volume directories: %v", duplicateDir) + os.Exit(1) } if in.GetVolumeSizeLimit() != 0 && vs.store.GetVolumeSizeLimit() != in.GetVolumeSizeLimit() { vs.store.SetVolumeSizeLimit(in.GetVolumeSizeLimit()) |