Skip to content

Commit 15b98e8

Browse files
committed
minor refactor createworkloadhandler
1 parent e55dcd4 commit 15b98e8

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

cluster/calcium/remove.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (c *Calcium) RemoveWorkload(ctx context.Context, ids []string, force bool)
4545
},
4646
// then
4747
func(ctx context.Context) (err error) {
48-
if err = c.doRemoveWorkload(ctx, workload, force); err != nil {
48+
if err = c.doRemoveWorkload(ctx, workload, force); err == nil {
4949
log.Infof(ctx, "[RemoveWorkload] Workload %s removed", workload.ID)
5050
}
5151
return err
@@ -110,6 +110,7 @@ func (c *Calcium) doRemoveWorkloadSync(ctx context.Context, ids []string) error
110110
}
111111

112112
for m := range ch {
113+
// TODO deal with failed
113114
log.Debugf(ctx, "[doRemoveWorkloadSync] Removed %s", m.WorkloadID)
114115
}
115116
return nil

cluster/calcium/wal.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,9 @@ func (h *CreateWorkloadHandler) Handle(ctx context.Context, raw interface{}) (er
169169
defer cancel()
170170

171171
if _, err = h.calcium.GetWorkload(ctx, wrk.ID); err == nil {
172-
// workload meta exists
173-
ch, err := h.calcium.RemoveWorkload(ctx, []string{wrk.ID}, true)
174-
if err != nil {
175-
return logger.Err(ctx, err)
176-
}
177-
for msg := range ch {
178-
if !msg.Success {
179-
logger.Errorf(ctx, "failed to remove workload")
180-
}
172+
if err = h.calcium.doRemoveWorkloadSync(ctx, []string{wrk.ID}); err != nil {
173+
return err
181174
}
182-
logger.Infof(ctx, "workload with meta removed")
183175
return nil
184176
}
185177

0 commit comments

Comments
 (0)