Skip to content

Commit 74ebf43

Browse files
committed
fix READY Instance
1 parent 1913e96 commit 74ebf43

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

pkg/scheduler/scheduler.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ func AggregateInstance(pis map[string]*types.ProblemInstance, zps []types.ZonePr
8585
pis[pn].Abandoned = pis[pn].Abandoned + 1
8686
case "":
8787
pis[pn].Ready = pis[pn].Ready + 1
88+
pis[pn].KIS = append(pis[pn].KIS, types.KeepInstance{InstanceName: p.Name, ProjectName: p.ProjectName, ZoneName: p.ZoneName, CreatedAt: p.CreatedAt})
8889
}
8990
pis[pn].CurrentInstance = pis[pn].CurrentInstance + 1
9091
//ZoneごとのInstance数を集計する
@@ -144,7 +145,7 @@ func DeleteScheduler(dis []types.DeleteInstance, vmmsClient *vmms.Client, lg *za
144145
if err != nil {
145146
msg := ""
146147
for _, v := range dis[i-1:] {
147-
msg = msg + v.ProblemName + ","
148+
msg = msg + v.ProblemName + ": " + v.InstanceName + ", "
148149
}
149150
return fmt.Errorf("Remains on the CreateInstanceList. %s", msg)
150151
}
@@ -192,7 +193,7 @@ func CreateScheduler(cis []types.CreateInstance, zps []types.ZonePriority, vmmsC
192193
//err処理。
193194
msg := ""
194195
for _, v := range cis[i-1:] {
195-
msg = msg + v.ProblemName
196+
msg = msg + v.ProblemName + ", "
196197
}
197198
return fmt.Errorf("Error. %s Remains on the CreateInstanceList. %s", err, msg)
198199
}

0 commit comments

Comments
 (0)