mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/nar-bridge): simplify CLI interface

Browse source 
Only keep the `serve` subcommand, and make it appear at the root.
Introduce a --log-level argument, and be a bit less noisy in normal
operation.

Change-Id: I86b8abde1869a5c0c947508bcc29f845222aac09
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9360
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-09-18 12:04:59 +03:00 • committed by flokli
parent dd7cc6ed68
commit 07af692ecb
8 changed files with 58 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tvix/nar-bridge/pkg/server/blob_upload.go
View file

@ -64,7 +64,7 @@ func genBlobServiceWriteCb(ctx context.Context, blobServiceClient storev1pb.Blob
log.WithFields(log.Fields{
"blob_digest": base64.StdEncoding.EncodeToString(resp.GetDigest()),
"blob_size": blobSize,
}).Info("uploaded blob")
}).Debug("uploaded blob")
return nil
}

2
tvix/nar-bridge/pkg/server/directory_upload.go
View file

@ -44,7 +44,7 @@ func (du *DirectoriesUploader) Put(directory *storev1pb.Directory) error {
if err != nil {
return fmt.Errorf("error sending directory: %w", err)
}
log.WithField("digest", base64.StdEncoding.EncodeToString(directoryDgst)).Info("uploaded directory")
log.WithField("digest", base64.StdEncoding.EncodeToString(directoryDgst)).Debug("uploaded directory")
return nil
}

9
tvix/nar-bridge/pkg/server/nar_get.go
View file

@ -85,8 +85,7 @@ func renderNar(
return fmt.Errorf("unable to calculate directory digest: %w", err)
}
// TODO: debug level
log.WithField("directory", base64.StdEncoding.EncodeToString(directoryDgst)).Info("received directory node")
log.WithField("directory", base64.StdEncoding.EncodeToString(directoryDgst)).Debug("received directory node")
directories[hex.EncodeToString(directoryDgst)] = directory
}
@ -98,8 +97,7 @@ func renderNar(
w,
pathInfo,
func(directoryDigest []byte) (*storev1pb.Directory, error) {
// TODO: debug level
log.WithField("directory", base64.StdEncoding.EncodeToString(directoryDigest)).Info("Get directory")
log.WithField("directory", base64.StdEncoding.EncodeToString(directoryDigest)).Debug("Get directory")
directoryRefStr := hex.EncodeToString(directoryDigest)
directory, found := directories[directoryRefStr]
if !found {
@ -113,8 +111,7 @@ func renderNar(
return directory, nil
},
func(blobDigest []byte) (io.ReadCloser, error) {
// TODO: debug level
log.WithField("blob", base64.StdEncoding.EncodeToString(blobDigest)).Info("Get blob")
log.WithField("blob", base64.StdEncoding.EncodeToString(blobDigest)).Debug("Get blob")
resp, err := blobServiceClient.Read(ctx, &storev1pb.ReadBlobRequest{
Digest: blobDigest,
})

2
tvix/nar-bridge/pkg/server/nar_put.go
View file

@ -60,7 +60,7 @@ func registerNarPut(s *Server) {
return
}
log.Infof("closing the stream")
log.Debug("closing the stream")
// Close the directories uploader
directoriesPutResponse, err := directoriesUploader.Done()

2
tvix/nar-bridge/pkg/server/narinfo_put.go
View file

@ -167,7 +167,7 @@ func registerNarinfoPut(s *Server) {
return
}
log.Infof("received new pathInfo: %v+", receivedPathInfo)
log.Debugf("received new pathInfo: %v+", receivedPathInfo)
// TODO: update the local temporary pathinfo with this?
})