Add MirrorStatus.LastStarted property

- status.Status is in PreSyncing, and
- curStatus.Status is not in PreSyncing

internal/msg.go

@@ -13,6 +13,7 @@ type MirrorStatus struct {
 	IsMaster    bool       `json:"is_master"`
 	Status      SyncStatus `json:"status"`
 	LastUpdate  time.Time  `json:"last_update"`
+	LastStarted time.Time  `json:"last_started"`
 	LastEnded   time.Time  `json:"last_ended"`
 	Scheduled   time.Time  `json:"next_schedule"`
 	Upstream    string     `json:"upstream"`

internal/status_web.go

@@ -43,6 +43,8 @@ type WebMirrorStatus struct {
 	Status        SyncStatus `json:"status"`
 	LastUpdate    textTime   `json:"last_update"`
 	LastUpdateTs  stampTime  `json:"last_update_ts"`
+	LastStarted   textTime   `json:"last_started"`
+	LastStartedTs stampTime  `json:"last_started_ts"`
 	LastEnded     textTime   `json:"last_ended"`
 	LastEndedTs   stampTime  `json:"last_ended_ts"`
 	Scheduled     textTime   `json:"next_schedule"`
@@ -58,6 +60,8 @@ func BuildWebMirrorStatus(m MirrorStatus) WebMirrorStatus {
 		Status:        m.Status,
 		LastUpdate:    textTime{m.LastUpdate},
 		LastUpdateTs:  stampTime{m.LastUpdate},
+		LastStarted:   textTime{m.LastStarted},
+		LastStartedTs: stampTime{m.LastStarted},
 		LastEnded:     textTime{m.LastEnded},
 		LastEndedTs:   stampTime{m.LastEnded},
 		Scheduled:     textTime{m.Scheduled},

internal/status_web_test.go

@@ -19,6 +19,8 @@ func TestStatus(t *testing.T) {
 			Status:        Success,
 			LastUpdate:    textTime{t},
 			LastUpdateTs:  stampTime{t},
+			LastStarted:   textTime{t},
+			LastStartedTs: stampTime{t},
 			LastEnded:     textTime{t},
 			LastEndedTs:   stampTime{t},
 			Scheduled:     textTime{t},
@@ -40,6 +42,10 @@ func TestStatus(t *testing.T) {
 		So(m2.LastUpdateTs.Unix(), ShouldEqual, m.LastUpdate.Unix())
 		So(m2.LastUpdate.UnixNano(), ShouldEqual, m.LastUpdate.UnixNano())
 		So(m2.LastUpdateTs.UnixNano(), ShouldEqual, m.LastUpdate.UnixNano())
+		So(m2.LastStarted.Unix(), ShouldEqual, m.LastStarted.Unix())
+		So(m2.LastStartedTs.Unix(), ShouldEqual, m.LastStarted.Unix())
+		So(m2.LastStarted.UnixNano(), ShouldEqual, m.LastStarted.UnixNano())
+		So(m2.LastStartedTs.UnixNano(), ShouldEqual, m.LastStarted.UnixNano())
 		So(m2.LastEnded.Unix(), ShouldEqual, m.LastEnded.Unix())
 		So(m2.LastEndedTs.Unix(), ShouldEqual, m.LastEnded.Unix())
 		So(m2.LastEnded.UnixNano(), ShouldEqual, m.LastEnded.UnixNano())
@@ -58,6 +64,7 @@ func TestStatus(t *testing.T) {
 			IsMaster:    true,
 			Status:      Failed,
 			LastUpdate:  time.Now().Add(-time.Minute * 30),
+			LastStarted: time.Now().Add(-time.Minute * 1),
 			LastEnded:   time.Now(),
 			Scheduled:   time.Now().Add(time.Minute * 5),
 			Upstream:    "mirrors.tuna.tsinghua.edu.cn",
@@ -73,6 +80,10 @@ func TestStatus(t *testing.T) {
 		So(m2.LastUpdateTs.Unix(), ShouldEqual, m.LastUpdate.Unix())
 		So(m2.LastUpdate.UnixNano(), ShouldEqual, m.LastUpdate.UnixNano())
 		So(m2.LastUpdateTs.UnixNano(), ShouldEqual, m.LastUpdate.UnixNano())
+		So(m2.LastStarted.Unix(), ShouldEqual, m.LastStarted.Unix())
+		So(m2.LastStartedTs.Unix(), ShouldEqual, m.LastStarted.Unix())
+		So(m2.LastStarted.UnixNano(), ShouldEqual, m.LastStarted.UnixNano())
+		So(m2.LastStartedTs.UnixNano(), ShouldEqual, m.LastStarted.UnixNano())
 		So(m2.LastEnded.Unix(), ShouldEqual, m.LastEnded.Unix())
 		So(m2.LastEndedTs.Unix(), ShouldEqual, m.LastEnded.Unix())
 		So(m2.LastEnded.UnixNano(), ShouldEqual, m.LastEnded.UnixNano())

manager/db_test.go

@@ -83,6 +83,7 @@ func TestBoltAdapter(t *testing.T) {
 					IsMaster:    true,
 					Status:      Success,
 					LastUpdate:  time.Now(),
+					LastStarted: time.Now().Add(-time.Minute),
 					LastEnded:   time.Now(),
 					Upstream:    "mirrors.tuna.tsinghua.edu.cn",
 					Size:        "3GB",
@@ -93,6 +94,7 @@ func TestBoltAdapter(t *testing.T) {
 					IsMaster:    true,
 					Status:      Disabled,
 					LastUpdate:  time.Now().Add(-time.Hour),
+					LastStarted: time.Now().Add(-time.Minute),
 					LastEnded:   time.Now(),
 					Upstream:    "mirrors.tuna.tsinghua.edu.cn",
 					Size:        "4GB",
@@ -102,7 +104,8 @@ func TestBoltAdapter(t *testing.T) {
 					Worker:      testWorkerIDs[1],
 					IsMaster:    true,
 					Status:      Success,
-					LastUpdate: time.Now().Add(-time.Second),
+					LastUpdate:  time.Now().Add(-time.Minute),
+					LastStarted: time.Now().Add(-time.Second),
 					LastEnded:   time.Now(),
 					Upstream:    "mirrors.tuna.tsinghua.edu.cn",
 					Size:        "4GB",

manager/server.go

@@ -297,14 +297,21 @@ func (s *Manager) updateJobOfWorker(c *gin.Context) {
 
 	curStatus, _ := s.adapter.GetMirrorStatus(workerID, mirrorName)
 
+	curTime := time.Now()
+
+	if status.Status == PreSyncing && curStatus.Status != PreSyncing {
+		status.LastStarted = curTime
+	} else {
+		status.LastStarted = curStatus.LastStarted
+	}
 	// Only successful syncing needs last_update
 	if status.Status == Success {
-		status.LastUpdate = time.Now()
+		status.LastUpdate = curTime
 	} else {
 		status.LastUpdate = curStatus.LastUpdate
 	}
 	if status.Status == Success || status.Status == Failed {
-		status.LastEnded = time.Now()
+		status.LastEnded = curTime
 	} else {
 		status.LastEnded = curStatus.LastEnded
 	}

manager/server_test.go

@@ -151,6 +151,7 @@ func TestHTTPServer(t *testing.T) {
 					So(m.Size, ShouldEqual, status.Size)
 					So(m.IsMaster, ShouldEqual, status.IsMaster)
 					So(time.Now().Sub(m.LastUpdate), ShouldBeLessThan, 1*time.Second)
+					So(time.Now().Sub(m.LastStarted), ShouldBeLessThan, 2*time.Minute)
 					So(time.Now().Sub(m.LastEnded), ShouldBeLessThan, 1*time.Second)
 
 				})
@@ -168,6 +169,7 @@ func TestHTTPServer(t *testing.T) {
 					So(m.Size, ShouldEqual, status.Size)
 					So(m.IsMaster, ShouldEqual, status.IsMaster)
 					So(time.Now().Sub(m.LastUpdate.Time), ShouldBeLessThan, 1*time.Second)
+					So(time.Now().Sub(m.LastStarted.Time), ShouldBeLessThan, 2*time.Minute)
 					So(time.Now().Sub(m.LastEnded.Time), ShouldBeLessThan, 1*time.Second)
 
 				})
@@ -198,6 +200,7 @@ func TestHTTPServer(t *testing.T) {
 						So(m.Size, ShouldEqual, "5GB")
 						So(m.IsMaster, ShouldEqual, status.IsMaster)
 						So(time.Now().Sub(m.LastUpdate), ShouldBeLessThan, 1*time.Second)
+						So(time.Now().Sub(m.LastStarted), ShouldBeLessThan, 2*time.Minute)
 						So(time.Now().Sub(m.LastEnded), ShouldBeLessThan, 1*time.Second)
 					})
 				})
@@ -251,6 +254,7 @@ func TestHTTPServer(t *testing.T) {
 					So(m.Size, ShouldEqual, status.Size)
 					So(m.IsMaster, ShouldEqual, status.IsMaster)
 					So(time.Now().Sub(m.LastUpdate), ShouldBeGreaterThan, 3*time.Second)
+					So(time.Now().Sub(m.LastStarted), ShouldBeGreaterThan, 1*time.Minute)
 					So(time.Now().Sub(m.LastEnded), ShouldBeLessThan, 1*time.Second)
 				})
 			})
@@ -263,6 +267,7 @@ func TestHTTPServer(t *testing.T) {
 					IsMaster:    true,
 					Status:      Success,
 					LastUpdate:  time.Now(),
+					LastStarted: time.Now(),
 					LastEnded:   time.Now(),
 					Upstream:    "mirrors.tuna.tsinghua.edu.cn",
 					Size:        "4GB",