Skip to content

Test before computing ID and uploading package to storage #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreasjansson merged 1 commit into from
Apr 29, 2021
Merged

Test before computing ID and uploading package to storage #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions pkg/server/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ func (s *Server) ReceiveModel(r *http.Request, logWriter logger.Logger, user str
if err := z.ReaderUnarchive(inputFile, header.Size, dir, zipCache); err != nil {
return nil, fmt.Errorf("Failed to unzip: %w", err)
}
id, err := computeID(dir)
if err != nil {
return nil, err
}
logWriter.Infof("Received model %s", id)
logWriter.Infof("Received model")

configRaw, err := os.ReadFile(filepath.Join(dir, global.ConfigFilename))
if err != nil {
Expand Down Expand Up @@ -99,16 +95,11 @@ func (s *Server) ReceiveModel(r *http.Request, logWriter logger.Logger, user str
}
defer file.Close()

if err := s.store.Upload(user, name, id, file); err != nil {
return nil, fmt.Errorf("Failed to upload to storage: %w", err)
}

artifacts, err := s.buildDockerImages(dir, config, name, logWriter)
if err != nil {
return nil, err
}
mod := &model.Model{
ID: id,
Artifacts: artifacts,
Config: config,
Created: time.Now(),
Expand All @@ -131,6 +122,14 @@ func (s *Server) ReceiveModel(r *http.Request, logWriter logger.Logger, user str
// TODO(andreas): return other response than 500 if validation fails
return nil, err
}
id, err := computeID(dir)
if err != nil {
return nil, err
}
if err := s.store.Upload(user, name, id, file); err != nil {
return nil, fmt.Errorf("Failed to upload to storage: %w", err)
}
mod.ID = id
mod.RunArguments = runArgs
mod.Stats = modelStats

Expand Down