|
|
|
@@ -12,6 +12,7 @@ import ( |
|
|
|
"server/common/constant" |
|
|
|
"server/common/errors" |
|
|
|
"server/common/utils" |
|
|
|
"server/common/utils/collections/set" |
|
|
|
"strconv" |
|
|
|
"strings" |
|
|
|
"time" |
|
|
|
@@ -532,12 +533,12 @@ func (s *developService) StartNotebook(ctx context.Context, req *api.StartNotebo |
|
|
|
} |
|
|
|
}() |
|
|
|
|
|
|
|
err = s.data.DevelopDao.CreateNotebookEventRecord(ctx, &model.NotebookEventRecord{ |
|
|
|
err1 := s.data.DevelopDao.CreateNotebookEventRecord(ctx, &model.NotebookEventRecord{ |
|
|
|
Time: time.Now(), |
|
|
|
NotebookId: nb.Id, |
|
|
|
Type: commapi.NotebookEventRecordType_START, |
|
|
|
}) |
|
|
|
if err != nil { // 插入事件记录出错只打印 |
|
|
|
if err1 != nil { // 插入事件记录出错只打印 |
|
|
|
s.log.Error(ctx, "create notebook event record error:", err) |
|
|
|
} |
|
|
|
|
|
|
|
@@ -964,6 +965,29 @@ func (s *developService) GetNotebookEventList(ctx context.Context, req *api.Note |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
|
|
|
|
if query.Id == "" { |
|
|
|
if req.NotebookId == "" { |
|
|
|
s.log.Errorf(ctx, "job id and notebook id empty") |
|
|
|
return nil, errors.Errorf(nil, errors.ErrorInvalidRequestParameter) |
|
|
|
} |
|
|
|
nbIds := make([]string, 0) |
|
|
|
nbIds = append(nbIds, req.NotebookId) |
|
|
|
nbIds = set.NewStrings(nbIds...).Values() |
|
|
|
nbs, _, err := s.data.DevelopDao.ListNotebook(ctx, &model.NotebookQuery{Ids: nbIds}) |
|
|
|
if err != nil { |
|
|
|
s.log.Errorf(ctx, "ListNotebook err: %s", err) |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
if len(nbs) > 0 { |
|
|
|
for _, nb := range nbs { |
|
|
|
query.Id = nb.NotebookJobId |
|
|
|
} |
|
|
|
} else { |
|
|
|
s.log.Errorf(ctx, "no notebook job found") |
|
|
|
return nil, fmt.Errorf("no notebook job found") |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
events, totalSize, err := s.data.DevelopDao.GetNotebookEvents(query) |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
|
