This commit is contained in:
Chris Lu
2021-08-14 02:55:44 -07:00
parent 7937db52e1
commit 0db2517994
3 changed files with 2 additions and 4 deletions

View File

@@ -109,11 +109,9 @@ func startMasterFollower(masterOptions MasterOptions) {
return return
} }
option := masterOptions.toMasterOption(nil) option := masterOptions.toMasterOption(nil)
option.IsFollower = true option.IsFollower = true
r := mux.NewRouter() r := mux.NewRouter()
ms := weed_server.NewMasterServer(r, option, masters) ms := weed_server.NewMasterServer(r, option, masters)
listeningAddress := *masterOptions.ipBind + ":" + strconv.Itoa(*masterOptions.port) listeningAddress := *masterOptions.ipBind + ":" + strconv.Itoa(*masterOptions.port)

View File

@@ -96,7 +96,7 @@ func (fs *FilerSource) LookupFileId(part string) (fileUrls []string, err error)
func (fs *FilerSource) ReadPart(fileId string) (filename string, header http.Header, resp *http.Response, err error) { func (fs *FilerSource) ReadPart(fileId string) (filename string, header http.Header, resp *http.Response, err error) {
if fs.proxyByFiler { if fs.proxyByFiler {
return util.DownloadFile("http://" + fs.address + "/?proxyChunkId=" + fileId, "") return util.DownloadFile("http://"+fs.address+"/?proxyChunkId="+fileId, "")
} }
fileUrls, err := fs.LookupFileId(fileId) fileUrls, err := fs.LookupFileId(fileId)

View File

@@ -195,7 +195,7 @@ func markVolumeWritable(grpcDialOption grpc.DialOption, volumeId needle.VolumeId
func markVolumeReplicasWritable(grpcDialOption grpc.DialOption, volumeId needle.VolumeId, locations []wdclient.Location, writable bool) error { func markVolumeReplicasWritable(grpcDialOption grpc.DialOption, volumeId needle.VolumeId, locations []wdclient.Location, writable bool) error {
for _, location := range locations { for _, location := range locations {
fmt.Printf("markVolumeReadonly %d on %s ...\n", volumeId, location.Url) fmt.Printf("markVolumeReadonly %d on %s ...\n", volumeId, location.Url)
if err:= markVolumeWritable(grpcDialOption, volumeId, location.Url, writable); err != nil { if err := markVolumeWritable(grpcDialOption, volumeId, location.Url, writable); err != nil {
return err return err
} }
} }