Expose WorkerID

Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>

api/api_full.go

@@ -781,8 +781,9 @@ type IpldObject struct {
 }
 
 type ActiveSync struct {
-	Base   *types.TipSet
+	WorkerID uint64
-	Target *types.TipSet
+	Base     *types.TipSet
+	Target   *types.TipSet
 
 	Stage  SyncStateStage
 	Height abi.ChainEpoch

chain/sync_manager.go

@@ -135,7 +135,7 @@ func (sm *syncManager) SetPeerHead(ctx context.Context, p peer.ID, ts *types.Tip
 
 func (sm *syncManager) State() []SyncerStateSnapshot {
 	sm.mx.Lock()
-	workerStates := make([]*workerState, 0, len(sm.state))
+	workerStates := make([]*workerState, 0, len(sm.state)+len(sm.history))
 	for _, ws := range sm.state {
 		workerStates = append(workerStates, ws)
 	}
@@ -285,6 +285,7 @@ func (sm *syncManager) spawnWorker(target *types.TipSet) {
 		ts: target,
 		ss: new(SyncerState),
 	}
+	ws.ss.data.WorkerID = id
 
 	sm.mx.Lock()
 	sm.state[id] = ws

chain/syncstate.go

@@ -12,13 +12,14 @@ import (
 )
 
 type SyncerStateSnapshot struct {
-	Target  *types.TipSet
+	WorkerID uint64
-	Base    *types.TipSet
+	Target   *types.TipSet
-	Stage   api.SyncStateStage
+	Base     *types.TipSet
-	Height  abi.ChainEpoch
+	Stage    api.SyncStateStage
-	Message string
+	Height   abi.ChainEpoch
-	Start   time.Time
+	Message  string
-	End     time.Time
+	Start    time.Time
+	End      time.Time
 }
 
 type SyncerState struct {

cli/sync.go

@@ -45,8 +45,8 @@ var syncStatusCmd = &cli.Command{
 		}
 
 		fmt.Println("sync status:")
-		for i, ss := range state.ActiveSyncs {
+		for _, ss := range state.ActiveSyncs {
-			fmt.Printf("worker %d:\n", i)
+			fmt.Printf("worker %d:\n", ss.WorkerID)
 			var base, target []cid.Cid
 			var heightDiff int64
 			var theight abi.ChainEpoch

node/impl/full/sync.go

@@ -37,13 +37,14 @@ func (a *SyncAPI) SyncState(ctx context.Context) (*api.SyncState, error) {
 	for i := range states {
 		ss := &states[i]
 		out.ActiveSyncs = append(out.ActiveSyncs, api.ActiveSync{
-			Base:    ss.Base,
+			WorkerID: ss.WorkerID,
-			Target:  ss.Target,
+			Base:     ss.Base,
-			Stage:   ss.Stage,
+			Target:   ss.Target,
-			Height:  ss.Height,
+			Stage:    ss.Stage,
-			Start:   ss.Start,
+			Height:   ss.Height,
-			End:     ss.End,
+			Start:    ss.Start,
-			Message: ss.Message,
+			End:      ss.End,
+			Message:  ss.Message,
 		})
 	}
 	return out, nil