bugfix: update cdn fail when the content is being read and the source…

… server is down Signed-off-by: Starnop <[email protected]>
dragonflyoss · Jan 13, 2020 · 7d00289 · 7d00289
1 parent 239454c
commit 7d00289
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 14 deletions.
diff --git a/dfget-31028-1577713727.584.tmp-027362658 b/dfget-31028-1577713727.584.tmp-027362658
diff --git a/dfget/core/core.go b/dfget/core/core.go
@@ -188,11 +188,11 @@ func downloadFile(cfg *config.Config, supernodeAPI api.SupernodeAPI,
 	}
 
 	if success {
-		logrus.Infof("download SUCCESS from supernode %s cost:%.3fs length:%d",
-			cfg.Nodes, time.Since(cfg.StartTime).Seconds(), cfg.RV.FileLength)
+		logrus.Infof("download SUCCESS cost:%.3fs length:%d",
+			time.Since(cfg.StartTime).Seconds(), cfg.RV.FileLength)
 	} else {
-		logrus.Infof("download FAIL from supernode %s cost:%.3fs length:%d reason:%d",
-			cfg.Nodes, time.Since(cfg.StartTime).Seconds(), cfg.RV.FileLength, cfg.BackSourceReason)
+		logrus.Infof("download FAIL cost:%.3fs length:%d reason:%d error:%v",
+			time.Since(cfg.StartTime).Seconds(), cfg.RV.FileLength, cfg.BackSourceReason, err)
 	}
 	return err
 }

diff --git a/dfget/core/regist/register.go b/dfget/core/regist/register.go
@@ -40,8 +40,9 @@ type SupernodeRegister interface {
 }
 
 type supernodeRegister struct {
-	api api.SupernodeAPI
-	cfg *config.Config
+	api                api.SupernodeAPI
+	cfg                *config.Config
+	lastRegisteredNode string
 }
 
 var _ SupernodeRegister = &supernodeRegister{}
@@ -68,6 +69,10 @@ func (s *supernodeRegister) Register(peerPort int) (*RegisterResult, *errortypes
 	nodes, nLen := s.cfg.Nodes, len(s.cfg.Nodes)
 	req := s.constructRegisterRequest(peerPort)
 	for i = 0; i < nLen; i++ {
+		if s.lastRegisteredNode == nodes[i] {
+			logrus.Warnf("the last registered node is the same(%s)", nodes[i])
+			continue
+		}
 		req.SupernodeIP = netutils.ExtractHost(nodes[i])
 		resp, e = s.api.Register(nodes[i], req)
 		logrus.Infof("do register to %s, res:%s error:%v", nodes[i], resp, e)
@@ -86,6 +91,7 @@ func (s *supernodeRegister) Register(peerPort int) (*RegisterResult, *errortypes
 			time.Sleep(2500 * time.Millisecond)
 		}
 	}
+	s.setLastRegisteredNode(i)
 	s.setRemainderNodes(i)
 	if err := s.checkResponse(resp, e); err != nil {
 		logrus.Errorf("register fail:%v", err)
@@ -113,16 +119,29 @@ func (s *supernodeRegister) checkResponse(resp *types.RegisterResponse, e error)
 	return nil
 }
 
+func (s *supernodeRegister) setLastRegisteredNode(idx int) {
+	nLen := len(s.cfg.Nodes)
+	if nLen <= 0 {
+		return
+	}
+	if idx >= nLen {
+		s.lastRegisteredNode = ""
+		return
+	}
+	s.lastRegisteredNode = s.cfg.Nodes[idx]
+}
+
 func (s *supernodeRegister) setRemainderNodes(idx int) {
 	nLen := len(s.cfg.Nodes)
 	if nLen <= 0 {
 		return
 	}
-	if idx < nLen {
-		s.cfg.Nodes = s.cfg.Nodes[idx+1:]
-	} else {
+	if idx >= nLen {
 		s.cfg.Nodes = []string{}
+		return
 	}
+
+	s.cfg.Nodes = s.cfg.Nodes[idx+1:]
 }
 
 func (s *supernodeRegister) constructRegisterRequest(port int) *types.RegisterRequest {

diff --git a/dfget/core/regist/register_test.go b/dfget/core/regist/register_test.go
@@ -76,9 +76,8 @@ func (s *RegistTestSuite) TestSupernodeRegister_Register(c *check.C) {
 	m := new(MockSupernodeAPI)
 	m.RegisterFunc = CreateRegisterFunc()
 
-	register := NewSupernodeRegister(cfg, m)
-
 	var f = func(ec int, msg string, data *RegisterResult) {
+		register := NewSupernodeRegister(cfg, m)
 		resp, e := register.Register(0)
 		if msg == "" {
 			c.Assert(e, check.IsNil)
@@ -92,7 +91,7 @@ func (s *RegistTestSuite) TestSupernodeRegister_Register(c *check.C) {
 	}
 
 	cfg.Nodes = []string{""}
-	f(constants.HTTPError, "connection refused", nil)
+	f(constants.HTTPError, "empty response, unknown error", nil)
 
 	cfg.Nodes = []string{"x"}
 	f(501, "invalid source url", nil)
@@ -117,7 +116,7 @@ func (s *RegistTestSuite) TestSupernodeRegister_Register(c *check.C) {
 func (s *RegistTestSuite) TestSupernodeRegister_constructRegisterRequest(c *check.C) {
 	buf := &bytes.Buffer{}
 	cfg := s.createConfig(buf)
-	register := &supernodeRegister{nil, cfg}
+	register := &supernodeRegister{nil, cfg, ""}
 
 	cfg.Identifier = "id"
 	req := register.constructRegisterRequest(0)

diff --git a/supernode/daemon/mgr/cdn/manager.go b/supernode/daemon/mgr/cdn/manager.go
@@ -153,7 +153,7 @@ func (cm *Manager) TriggerCDN(ctx context.Context, task *types.TaskInfo) (*types
 	downloadMetadata, err := cm.writer.startWriter(ctx, cm.cfg, reader, task, startPieceNum, httpFileLength, pieceContSize)
 	if err != nil {
 		logrus.Errorf("failed to write for task %s: %v", task.ID, err)
-		return nil, err
+		return getUpdateTaskInfoWithStatusOnly(types.TaskInfoCdnStatusFAILED), err
 	}
 
 	realMD5 := reader.Md5()