refactor(tvix/nar-bridge): simplify CLI interface
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
flokli
parent
dd7cc6ed68
commit
07af692ecb
8 changed files with 58 additions and 140 deletions
|
|
@ -1,57 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"os/signal"
|
||||
|
||||
storev1pb "code.tvl.fyi/tvix/store/protos"
|
||||
|
||||
"code.tvl.fyi/tvix/nar-bridge/pkg/reader"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ImportCmd struct {
|
||||
NarPath string `name:"nar-path" help:"A path to a NAR file"`
|
||||
}
|
||||
|
||||
// `help:"Read a NAR file and display some information"`
|
||||
|
||||
func (cmd *ImportCmd) Run() error {
|
||||
retcode := 0
|
||||
|
||||
defer func() { os.Exit(retcode) }()
|
||||
|
||||
c := make(chan os.Signal, 1)
|
||||
signal.Notify(c, os.Interrupt)
|
||||
|
||||
go func() {
|
||||
for range c {
|
||||
log.Info("Received Signal, shutting down…")
|
||||
os.Exit(1)
|
||||
}
|
||||
}()
|
||||
|
||||
log.Infof("Reading %v...", cmd.NarPath)
|
||||
|
||||
f, _ := os.Open(cmd.NarPath)
|
||||
|
||||
r := reader.New(f)
|
||||
|
||||
actualPathInfo, _ := r.Import(
|
||||
context.Background(),
|
||||
func(fileReader io.Reader) error {
|
||||
return nil
|
||||
},
|
||||
func(directory *storev1pb.Directory) error {
|
||||
return nil
|
||||
},
|
||||
)
|
||||
|
||||
fmt.Printf("Node: %+v\n", actualPathInfo.Node)
|
||||
fmt.Printf("References: %+v\n", actualPathInfo.References)
|
||||
fmt.Printf("Narinfo: %+v\n", actualPathInfo.Narinfo)
|
||||
return nil
|
||||
}
|
||||
|
|
@ -2,29 +2,67 @@ package main
|
|||
|
||||
import (
|
||||
"os"
|
||||
"os/signal"
|
||||
|
||||
"github.com/alecthomas/kong"
|
||||
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/credentials/insecure"
|
||||
|
||||
"code.tvl.fyi/tvix/nar-bridge/pkg/server"
|
||||
storev1pb "code.tvl.fyi/tvix/store/protos"
|
||||
"github.com/sirupsen/logrus"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
//nolint:gochecknoglobals
|
||||
// `help:"Expose a tvix-store gRPC Interface as HTTP NAR/NARinfo"`
|
||||
var cli struct {
|
||||
// TODO: make log level configurable
|
||||
Import ImportCmd `kong:"cmd,name='import',help='Import a local NAR file into a tvix-store'"`
|
||||
Serve ServeCmd `kong:"cmd,name='serve',help='Expose a tvix-store RPC interface as NAR/NARInfo'"`
|
||||
LogLevel string `enum:"trace,debug,info,warn,error,fatal,panic" help:"The log level to log with" default:"info"`
|
||||
ListenAddr string `name:"listen-addr" help:"The address this service listens on" type:"string" default:"[::]:9000"` //nolint:lll
|
||||
EnableAccessLog bool `name:"access-log" help:"Enable access logging" type:"bool" default:"true" negatable:""` //nolint:lll
|
||||
StoreAddr string `name:"store-addr" help:"The address to the tvix-store RPC interface this will connect to"`
|
||||
}
|
||||
|
||||
func main() {
|
||||
parser, err := kong.New(&cli)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
_ = kong.Parse(&cli)
|
||||
|
||||
ctx, err := parser.Parse(os.Args[1:])
|
||||
logLevel, err := logrus.ParseLevel(cli.LogLevel)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
log.Panic("invalid log level")
|
||||
return
|
||||
}
|
||||
// Call the Run() method of the selected parsed command.
|
||||
err = ctx.Run()
|
||||
logrus.SetLevel(logLevel)
|
||||
|
||||
ctx.FatalIfErrorf(err)
|
||||
c := make(chan os.Signal, 1)
|
||||
signal.Notify(c, os.Interrupt)
|
||||
|
||||
go func() {
|
||||
for range c {
|
||||
log.Info("Received Signal, shutting down…")
|
||||
os.Exit(1)
|
||||
}
|
||||
}()
|
||||
|
||||
// connect to tvix-store
|
||||
log.Debugf("Dialing to %v", cli.StoreAddr)
|
||||
conn, err := grpc.Dial(cli.StoreAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
if err != nil {
|
||||
log.Fatalf("did not connect: %v", err)
|
||||
}
|
||||
defer conn.Close()
|
||||
|
||||
log.Printf("Starting nar-bridge at %v", cli.ListenAddr)
|
||||
s := server.New(
|
||||
storev1pb.NewDirectoryServiceClient(conn),
|
||||
storev1pb.NewBlobServiceClient(conn),
|
||||
storev1pb.NewPathInfoServiceClient(conn),
|
||||
cli.EnableAccessLog,
|
||||
30,
|
||||
)
|
||||
|
||||
err = s.ListenAndServe(cli.ListenAddr)
|
||||
if err != nil {
|
||||
log.Error("Server failed: %w", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
"os/signal"
|
||||
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/credentials/insecure"
|
||||
|
||||
"code.tvl.fyi/tvix/nar-bridge/pkg/server"
|
||||
storev1pb "code.tvl.fyi/tvix/store/protos"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ServeCmd struct {
|
||||
ListenAddr string `name:"listen-addr" help:"The address this service listens on" type:"string" default:"[::]:9000"` //nolint:lll
|
||||
EnableAccessLog bool `name:"access-log" help:"Enable access logging" type:"bool" default:"true" negatable:""` //nolint:lll
|
||||
StoreAddr string `name:"store-addr" help:"The address to the tvix-store RPC interface this will connect to"`
|
||||
}
|
||||
|
||||
// `help:"Expose a tvix-store RPC interface as NAR/NARInfo"`
|
||||
func (cmd *ServeCmd) Run() error {
|
||||
retcode := 0
|
||||
|
||||
defer func() { os.Exit(retcode) }()
|
||||
|
||||
c := make(chan os.Signal, 1)
|
||||
signal.Notify(c, os.Interrupt)
|
||||
|
||||
go func() {
|
||||
for range c {
|
||||
log.Info("Received Signal, shutting down…")
|
||||
//s.Close()
|
||||
os.Exit(1)
|
||||
}
|
||||
}()
|
||||
|
||||
// connect to tvix-store
|
||||
log.Debugf("Dialing to %v", cmd.StoreAddr)
|
||||
conn, err := grpc.Dial(cmd.StoreAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
if err != nil {
|
||||
log.Fatalf("did not connect: %v", err)
|
||||
}
|
||||
defer conn.Close()
|
||||
|
||||
log.Printf("Starting nar-bridge at %v", cmd.ListenAddr)
|
||||
s := server.New(
|
||||
storev1pb.NewDirectoryServiceClient(conn),
|
||||
storev1pb.NewBlobServiceClient(conn),
|
||||
storev1pb.NewPathInfoServiceClient(conn),
|
||||
cmd.EnableAccessLog,
|
||||
30,
|
||||
)
|
||||
|
||||
err = s.ListenAndServe(cmd.ListenAddr)
|
||||
if err != nil {
|
||||
log.Error("Server failed: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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?
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in a new issue