mirror of
https://github.com/minio/minio.git
synced 2025-03-30 09:13:41 -04:00
parent
ab7714b01e
commit
d0bb3dd136
@ -1577,9 +1577,6 @@ func (a adminAPIHandlers) ListBatchJobs(w http.ResponseWriter, r *http.Request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
jobType := r.Form.Get("jobType")
|
jobType := r.Form.Get("jobType")
|
||||||
if jobType == "" {
|
|
||||||
jobType = string(madmin.BatchJobReplicate)
|
|
||||||
}
|
|
||||||
|
|
||||||
resultCh := make(chan itemOrErr[ObjectInfo])
|
resultCh := make(chan itemOrErr[ObjectInfo])
|
||||||
|
|
||||||
@ -1608,7 +1605,7 @@ func (a adminAPIHandlers) ListBatchJobs(w http.ResponseWriter, r *http.Request)
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if jobType == string(req.Type()) {
|
if jobType == string(req.Type()) || jobType == "" {
|
||||||
listResult.Jobs = append(listResult.Jobs, madmin.BatchJobResult{
|
listResult.Jobs = append(listResult.Jobs, madmin.BatchJobResult{
|
||||||
ID: req.ID,
|
ID: req.ID,
|
||||||
Type: req.Type(),
|
Type: req.Type(),
|
||||||
@ -2049,7 +2046,9 @@ func (j *BatchJobPool) canceler(jobID string, cancel bool) error {
|
|||||||
canceler()
|
canceler()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
delete(j.jobCancelers, jobID)
|
if cancel {
|
||||||
|
delete(j.jobCancelers, jobID)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user