dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: optimize error message of preheating (#3622) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2024-10-30 16:18:25 +08:00 committed by GitHub
parent 19b38a1f47
commit ab11fbfda9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manager/middlewares/error.go
View File

@ -87,7 +87,7 @@ func Error() gin.HandlerFunc {
// GORM error handler // GORM error handler
if errors.Is(err.Err, gorm.ErrRecordNotFound) { if errors.Is(err.Err, gorm.ErrRecordNotFound) {
c.JSON(http.StatusNotFound, ErrorResponse{ c.JSON(http.StatusNotFound, ErrorResponse{
Message: http.StatusText(http.StatusNotFound), Message: err.Error(),
}) })
c.Abort() c.Abort()
return return

8
manager/service/job.go
View File

@ -186,7 +186,7 @@ func (s *service) findSchedulers(ctx context.Context, schedulerClusterIDs []uint
for _, schedulerClusterID := range schedulerClusterIDs { for _, schedulerClusterID := range schedulerClusterIDs {
schedulerCluster := models.SchedulerCluster{} schedulerCluster := models.SchedulerCluster{}
if err := s.db.WithContext(ctx).First(&schedulerCluster, schedulerClusterID).Error; err != nil { if err := s.db.WithContext(ctx).First(&schedulerCluster, schedulerClusterID).Error; err != nil {
return nil, err return nil, fmt.Errorf("scheduler cluster id %d: %w", schedulerClusterID, err)
} }
var schedulers []models.Scheduler var schedulers []models.Scheduler
@ -194,7 +194,7 @@ func (s *service) findSchedulers(ctx context.Context, schedulerClusterIDs []uint
SchedulerClusterID: schedulerCluster.ID, SchedulerClusterID: schedulerCluster.ID,
State: models.SchedulerStateActive, State: models.SchedulerStateActive,
}).Error; err != nil { }).Error; err != nil {
return nil, err return nil, fmt.Errorf("scheduler cluster id %d: %w", schedulerClusterID, err)
} }
activeSchedulers = append(activeSchedulers, schedulers...) activeSchedulers = append(activeSchedulers, schedulers...)
@ -233,7 +233,7 @@ func (s *service) findCandidateSchedulers(ctx context.Context, schedulerClusterI
for _, schedulerClusterID := range schedulerClusterIDs { for _, schedulerClusterID := range schedulerClusterIDs {
schedulerCluster := models.SchedulerCluster{} schedulerCluster := models.SchedulerCluster{}
if err := s.db.WithContext(ctx).First(&schedulerCluster, schedulerClusterID).Error; err != nil { if err := s.db.WithContext(ctx).First(&schedulerCluster, schedulerClusterID).Error; err != nil {
return nil, err return nil, fmt.Errorf("scheduler cluster id %d: %w", schedulerClusterID, err)
} }
var schedulers []models.Scheduler var schedulers []models.Scheduler
@ -241,7 +241,7 @@ func (s *service) findCandidateSchedulers(ctx context.Context, schedulerClusterI
SchedulerClusterID: schedulerCluster.ID, SchedulerClusterID: schedulerCluster.ID,
State: models.SchedulerStateActive, State: models.SchedulerStateActive,
}).Error; err != nil { }).Error; err != nil {
return nil, err return nil, fmt.Errorf("scheduler cluster id %d: %w", schedulerClusterID, err)
} }
for _, scheduler := range schedulers { for _, scheduler := range schedulers {