broadcast messages of new and deleted volumes

weed/filer2/filer_master.go

@@ -3,11 +3,10 @@ package filer2
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
 	"github.com/chrislusf/seaweedfs/weed/util"
+	"time"
 )
 
 func (fs *Filer) GetMaster() string {
@@ -16,6 +15,13 @@ func (fs *Filer) GetMaster() string {
 
 func (fs *Filer) KeepConnectedToMaster() {
 	glog.V(0).Infof("Filer bootstraps with masters %v", fs.masters)
+	for {
+		fs.tryAllMasters()
+		time.Sleep(time.Second)
+	}
+}
+
+func (fs *Filer) tryAllMasters() {
 	for _, master := range fs.masters {
 		glog.V(0).Infof("Connecting to %v", master)
 		withMasterClient(master, func(client master_pb.SeaweedClient) error {
@@ -28,17 +34,17 @@ func (fs *Filer) KeepConnectedToMaster() {
 			glog.V(0).Infof("Connected to %v", master)
 			fs.currentMaster = master
 
+			if err = stream.Send(&master_pb.ClientListenRequest{Name: "filer"}); err != nil {
+				glog.V(0).Infof("failed to send to %s: %v", master, err)
+				return err
+			}
+
 			for {
-				time.Sleep(time.Duration(float32(10*1e3)*0.25) * time.Millisecond)
-
-				if err = stream.Send(&master_pb.Empty{}); err != nil {
-					glog.V(0).Infof("failed to send to %s: %v", master, err)
-					return err
-				}
-
-				if _, err = stream.Recv(); err != nil {
+				if volumeLocation, err := stream.Recv(); err != nil {
 					glog.V(0).Infof("failed to receive from %s: %v", master, err)
 					return err
+				} else {
+					glog.V(0).Infof("volume location: %+v", volumeLocation)
 				}
 			}
 		})