add more comments of supernode implements

Signed-off-by [email protected]

Signed-off-by: henry.hj <[email protected]>

supernode/daemon/mgr/seed_task/manager.go

@@ -36,10 +36,14 @@ type TaskRegistryResponce struct {
 }
 
 type Manager struct {
+	/* interested in MaxSeedPerObject & PeerExpireTime */
 	cfg          *config.Config
-	taskStore    *dutil.Store /* taskid --> peerid set */
+	/* store all seed task info */
+	taskStore    *dutil.Store
+	/* store all seed peer info */
 	p2pInfoStore *dutil.Store
 	ipPortMap    *safeMap
+	/* create time of seed manager */
 	timeStamp    time.Time
 }
 
@@ -127,8 +131,13 @@ func ipPortToStr(ip strfmt.IPv4, port int32) string {
 	return fmt.Sprintf("%s-%d", ip.String(), port)
 }
 
+/*
+	1. Register peer(if not registered) & update heartbeat timestamp
+	2. if peer was restarted(with same ip-port pair), remove old peer info
+	3. try schedule a new seed task
+*/
 func (mgr *Manager) Register(ctx context.Context, request *types.TaskRegisterRequest) (*TaskRegistryResponce, error) {
-	logrus.Debugf("registry rt task %v", request)
+	logrus.Debugf("registry seed task %v", request)
 	request.TaskID = digest.Sha256(request.TaskURL)
 	resp := &TaskRegistryResponce{ TaskID: request.TaskID }
 
@@ -138,7 +147,7 @@ func (mgr *Manager) Register(ctx context.Context, request *types.TaskRegisterReq
 		Port:     request.Port,
 		Version:  request.Version,
 	}
-	// In real-time situation, cid == peer id
+	// cid == peer id
 	peerId := request.CID
 	p2pInfo := mgr.getOrCreateP2pInfo(ctx, peerId, peerCreateReq)
 	// update peer hb time
@@ -232,10 +241,12 @@ func (mgr *Manager) IsSeedTask(ctx context.Context, request *http.Request) bool
 func (mgr *Manager) ReportPeerHealth (ctx context.Context, peerId string) (*types.HeartBeatResponse, error) {
 	p2pInfo, err := mgr.getP2pInfo(ctx, peerId)
 	if err != nil {
+		// tell peer to register again
 		return &types.HeartBeatResponse{ NeedRegister:true, Version:mgr.timeStamp.String() }, nil
 	}
 	p2pInfo.update()
 
+	// return all tasks peer owned
 	return &types.HeartBeatResponse{
 		SeedTaskIds: p2pInfo.taskIds.list(),
 		Version:     mgr.timeStamp.String(),

supernode/daemon/mgr/seed_task/schedule.go

@@ -32,6 +32,7 @@ func (scheduler *defaultScheduler) Schedule(nowTasks []*SeedTaskInfo, newTask *S
 	idx := 0
 	for idx < len(nowTasks) {
 		if nowTasks[idx] == nil {
+			/* number of seed < MaxSeedPerObj */
 			if busyPeer != nil {
 				busyPeer = nil
 				pos = idx

supernode/daemon/mgr/seed_task/seed_task.go

@@ -48,11 +48,14 @@ type SeedTaskInfo struct {
 
 // point to a real-time task
 type SeedTaskMap struct {
+	/* seed task id */
 	taskId     string
 	lock       *sync.RWMutex
+	/* latest access time */
 	accessTime int64
+	/* store all task-peer info */
 	tasks      []*SeedTaskInfo
-	availTasks int
+	/* seed schedule method */
 	scheduler  seedScheduler
 }
 
@@ -61,7 +64,6 @@ func newSeedTaskMap(taskId string, maxTaskPeers int) *SeedTaskMap {
 		taskId:     taskId,
 		tasks:      make([]*SeedTaskInfo, maxTaskPeers),
 		lock:       new(sync.RWMutex),
-		availTasks: 0,
 		accessTime: -1,
 		scheduler:  &defaultScheduler{},
 	}
@@ -130,7 +132,6 @@ func (taskMap *SeedTaskMap) remove(id string) bool {
 			taskMap.tasks[i].P2pInfo.deleteTask(taskMap.taskId)
 			taskMap.tasks[i] = nil
 			left -= 1
-			taskMap.availTasks -= 1
 		}
 		i += 1
 	}
@@ -149,5 +150,4 @@ func (taskMap *SeedTaskMap) removeAllPeers() {
 		taskMap.tasks[idx] = nil
 		task.P2pInfo.deleteTask(task.TaskInfo.ID)
 	}
-	taskMap.availTasks = 0
 }

supernode/server/0.3_bridge.go

@@ -279,7 +279,7 @@ func (s *Server) reportServiceDown(ctx context.Context, rw http.ResponseWriter,
 	taskID := params.Get("taskId")
 	cID := params.Get("cid")
 
-	if req.Header.Get("X-report-resource") != "" {
+	if s.seedTaskMgr.IsSeedTask(ctx, req) {
 		err := s.seedTaskMgr.DeRegisterTask(ctx, cID, taskID)
 		if err != nil {
 			return err