split erred states from the rest

gql/resolver_sealingpipeline.go

@@ -75,36 +75,55 @@ func (r *resolver) SealingPipeline(ctx context.Context) (*sealingPipelineState,
 		}
 	}
 
-	// TODO: put states in order
-	var order int32
 	sectorStates := []*sectorState{}
-	for k, v := range summary {
-		if v == 0 {
+	for order, state := range allSectorStates {
+		count, ok := summary[api.SectorState(state)]
+		if !ok {
+			continue
+		}
+		if count == 0 {
 			continue
 		}
-		order++
 
-		if _, ok := normalSectors[string(k)]; ok {
+		if _, ok := normalSectors[state]; ok {
 			sectorStates = append(sectorStates, &sectorState{
-				Key:   string(k),
-				Value: int32(v),
+				Key:   state,
+				Value: int32(count),
 				Type:  "Regular",
-				Order: order,
+				Order: int32(order),
 			})
 			continue
 		}
 
-		if _, ok := snapdealsSectors[string(k)]; ok {
+		if _, ok := normalErredSectors[state]; ok {
 			sectorStates = append(sectorStates, &sectorState{
-				Key:   string(k),
-				Value: int32(v),
+				Key:   state,
+				Value: int32(count),
+				Type:  "Regular / Erred",
+				Order: int32(order),
+			})
+			continue
+		}
+
+		if _, ok := snapdealsSectors[state]; ok {
+			sectorStates = append(sectorStates, &sectorState{
+				Key:   state,
+				Value: int32(count),
 				Type:  "Snap Deals",
-				Order: order,
+				Order: int32(order),
 			})
 			continue
 		}
 
-		log.Errorw("unknown sector in resolver", "name", string(k), "count", v)
+		if _, ok := snapdealsSectors[state]; ok {
+			sectorStates = append(sectorStates, &sectorState{
+				Key:   state,
+				Value: int32(count),
+				Type:  "Snap Deals / Erred",
+				Order: int32(order),
+			})
+			continue
+		}
 	}
 
 	return &sealingPipelineState{

gql/sector_states.go

@@ -1,9 +1,14 @@
 package gql
 
 var (
-	normalSectors    map[string]struct{}
-	snapdealsSectors map[string]struct{}
+	normalSectors         map[string]struct{}
+	normalErredSectors    map[string]struct{}
+	snapdealsSectors      map[string]struct{}
+	snapdealsErredSectors map[string]struct{}
 
+	allSectorStates []string
+
+	// ordered
 	normalSectorsList = []string{
 		"WaitDeals",
 		"AddPiece",
@@ -25,8 +30,9 @@ var (
 		"CommitAggregateWait",
 		"FinalizeSector",
 		"Proving",
+	}
 
-		// error modes
+	normalErredSectorsList = []string{
 		"FailedUnrecoverable",
 		"AddPieceFailed",
 		"SealPreCommit1Failed",
@@ -63,7 +69,9 @@ var (
 		"FinalizeReplicaUpdate",
 		"UpdateActivating",
 		"ReleaseSectorKey",
+	}
 
+	snapdealsErredSectorsList = []string{
 		// snap deals error modes
 		"SnapDealsAddPieceFailed",
 		"SnapDealsDealsExpired",
@@ -76,13 +84,26 @@ var (
 )
 
 func init() {
+	allSectorStates = append(allSectorStates, normalSectorsList...)
+	allSectorStates = append(allSectorStates, normalErredSectorsList...)
+	allSectorStates = append(allSectorStates, snapdealsSectorsList...)
+	allSectorStates = append(allSectorStates, snapdealsErredSectorsList...)
+
 	normalSectors = make(map[string]struct{})
+	normalErredSectors = make(map[string]struct{})
 	snapdealsSectors = make(map[string]struct{})
+	snapdealsErredSectors = make(map[string]struct{})
 
 	for _, s := range normalSectorsList {
 		normalSectors[s] = struct{}{}
 	}
+	for _, s := range normalErredSectorsList {
+		normalErredSectors[s] = struct{}{}
+	}
 	for _, s := range snapdealsSectorsList {
 		snapdealsSectors[s] = struct{}{}
 	}
+	for _, s := range snapdealsErredSectorsList {
+		snapdealsErredSectors[s] = struct{}{}
+	}
 }