From 8239f32b62c4363377f0c513dbcd76dd1e50d01e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 3 Oct 2023 15:23:36 +0300 Subject: refactor(tvix/nar-bridge): mv nar-bridge{,-http} Rename the nar-bridge CLI to nar-bridge-http, because it's the one spinning up an http server. Change-Id: I0fb75c50e4299272a128dd5ecaa4be8f06fa3dbe Reviewed-on: https://cl.tvl.fyi/c/depot/+/9538 Reviewed-by: Connor Brewster Tested-by: BuildkiteCI Autosubmit: flokli --- tvix/boot/README.md | 4 +- tvix/nar-bridge/.gitignore | 2 +- tvix/nar-bridge/cmd/nar-bridge-http/main.go | 75 +++++++++++++++++++++++++++++ tvix/nar-bridge/cmd/nar-bridge/main.go | 75 ----------------------------- 4 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 tvix/nar-bridge/cmd/nar-bridge-http/main.go delete mode 100644 tvix/nar-bridge/cmd/nar-bridge/main.go (limited to 'tvix') diff --git a/tvix/boot/README.md b/tvix/boot/README.md index cf593dcc07..13a4855060 100644 --- a/tvix/boot/README.md +++ b/tvix/boot/README.md @@ -43,9 +43,9 @@ Potentially copy some data into tvix-store (via nar-bridge): ``` mg run //tvix:store -- daemon & -mg run //tvix:nar-bridge -- & +$(mg build //tvix:nar-bridge)/bin/nar-bridge-http & rm -Rf ~/.cache/nix; nix copy --to http://localhost:9000\?compression\=none $(mg build //third_party/nixpkgs:hello) -pkill nar-bridge; pkill tvix-store +pkill nar-bridge-http; pkill tvix-store ``` #### Interactive shell diff --git a/tvix/nar-bridge/.gitignore b/tvix/nar-bridge/.gitignore index 04260dbc58..867be7a127 100644 --- a/tvix/nar-bridge/.gitignore +++ b/tvix/nar-bridge/.gitignore @@ -1 +1 @@ -/nar_bridge +/nar-bridge-http diff --git a/tvix/nar-bridge/cmd/nar-bridge-http/main.go b/tvix/nar-bridge/cmd/nar-bridge-http/main.go new file mode 100644 index 0000000000..39892d37fe --- /dev/null +++ b/tvix/nar-bridge/cmd/nar-bridge-http/main.go @@ -0,0 +1,75 @@ +package main + +import ( + "context" + "os" + "os/signal" + "time" + + "github.com/alecthomas/kong" + + "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" + + castorev1pb "code.tvl.fyi/tvix/castore/protos" + narBridgeHttp "code.tvl.fyi/tvix/nar-bridge/pkg/http" + storev1pb "code.tvl.fyi/tvix/store/protos" + "github.com/sirupsen/logrus" + log "github.com/sirupsen/logrus" +) + +// `help:"Expose a tvix-store gRPC Interface as HTTP NAR/NARinfo"` +var cli struct { + 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" default:"localhost:8000"` //nolint:lll +} + +func main() { + _ = kong.Parse(&cli) + + logLevel, err := logrus.ParseLevel(cli.LogLevel) + if err != nil { + log.Panic("invalid log level") + return + } + logrus.SetLevel(logLevel) + + ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt) + defer stop() + + // connect to tvix-store + log.Debugf("Dialing to %v", cli.StoreAddr) + conn, err := grpc.DialContext(ctx, cli.StoreAddr, grpc.WithTransportCredentials(insecure.NewCredentials())) + if err != nil { + log.Fatalf("did not connect: %v", err) + } + defer conn.Close() + + s := narBridgeHttp.New( + castorev1pb.NewDirectoryServiceClient(conn), + castorev1pb.NewBlobServiceClient(conn), + storev1pb.NewPathInfoServiceClient(conn), + cli.EnableAccessLog, + 30, + ) + + log.Printf("Starting nar-bridge-http at %v", cli.ListenAddr) + go s.ListenAndServe(cli.ListenAddr) + + // listen for the interrupt signal. + <-ctx.Done() + + // Restore default behaviour on the interrupt signal + stop() + log.Info("Received Signal, shutting down, press Ctl+C again to force.") + + timeoutCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + + if s.Shutdown(timeoutCtx); err != nil { + log.WithError(err).Warn("failed to shutdown") + os.Exit(1) + } +} diff --git a/tvix/nar-bridge/cmd/nar-bridge/main.go b/tvix/nar-bridge/cmd/nar-bridge/main.go deleted file mode 100644 index d86e84b870..0000000000 --- a/tvix/nar-bridge/cmd/nar-bridge/main.go +++ /dev/null @@ -1,75 +0,0 @@ -package main - -import ( - "context" - "os" - "os/signal" - "time" - - "github.com/alecthomas/kong" - - "google.golang.org/grpc" - "google.golang.org/grpc/credentials/insecure" - - castorev1pb "code.tvl.fyi/tvix/castore/protos" - narBridgeHttp "code.tvl.fyi/tvix/nar-bridge/pkg/http" - storev1pb "code.tvl.fyi/tvix/store/protos" - "github.com/sirupsen/logrus" - log "github.com/sirupsen/logrus" -) - -// `help:"Expose a tvix-store gRPC Interface as HTTP NAR/NARinfo"` -var cli struct { - 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" default:"localhost:8000"` //nolint:lll -} - -func main() { - _ = kong.Parse(&cli) - - logLevel, err := logrus.ParseLevel(cli.LogLevel) - if err != nil { - log.Panic("invalid log level") - return - } - logrus.SetLevel(logLevel) - - ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt) - defer stop() - - // connect to tvix-store - log.Debugf("Dialing to %v", cli.StoreAddr) - conn, err := grpc.DialContext(ctx, cli.StoreAddr, grpc.WithTransportCredentials(insecure.NewCredentials())) - if err != nil { - log.Fatalf("did not connect: %v", err) - } - defer conn.Close() - - s := narBridgeHttp.New( - castorev1pb.NewDirectoryServiceClient(conn), - castorev1pb.NewBlobServiceClient(conn), - storev1pb.NewPathInfoServiceClient(conn), - cli.EnableAccessLog, - 30, - ) - - log.Printf("Starting nar-bridge at %v", cli.ListenAddr) - go s.ListenAndServe(cli.ListenAddr) - - // listen for the interrupt signal. - <-ctx.Done() - - // Restore default behaviour on the interrupt signal - stop() - log.Info("Received Signal, shutting down, press Ctl+C again to force.") - - timeoutCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second) - defer cancel() - - if s.Shutdown(timeoutCtx); err != nil { - log.WithError(err).Warn("failed to shutdown") - os.Exit(1) - } -} -- cgit 1.4.1