From e5bd55b93e24e29fcd31db915e4ad603a532a9e9 Mon Sep 17 00:00:00 2001 From: maxime Date: Mon, 23 Sep 2024 17:14:37 +0100 Subject: [PATCH 1/2] Add some debug logs in flair. --- flair/rpc/rpc.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flair/rpc/rpc.go b/flair/rpc/rpc.go index dedef4db..6cd87e9f 100644 --- a/flair/rpc/rpc.go +++ b/flair/rpc/rpc.go @@ -136,6 +136,7 @@ func (s *server) GetCapabilities(ctx context.Context, req *pb.GetCapabilitiesReq } func (s *server) GetActionResult(ctx context.Context, req *pb.GetActionResultRequest) (ar *pb.ActionResult, err error) { + log.Debugf("received GetActionResultRequest for %+v", req.GetActionDigest()) err = s.replicator.SequentialDigest(req.ActionDigest, func(srv *trie.Server) error { ctx, cancel := context.WithTimeout(ctx, s.timeout) defer cancel() @@ -275,6 +276,7 @@ func (s *server) BatchUpdateBlobs(ctx context.Context, req *pb.BatchUpdateBlobsR } func (s *server) BatchReadBlobs(ctx context.Context, req *pb.BatchReadBlobsRequest) (*pb.BatchReadBlobsResponse, error) { + log.Debugf("received BatchReadBlobsRequest for %+v", req.GetDigests()) blobs := map[*trie.Server][]*pb.Digest{} for _, d := range req.Digests { s := s.replicator.Trie.Get(d.Hash) @@ -402,6 +404,7 @@ func (s *server) GetTree(req *pb.GetTreeRequest, srv pb.ContentAddressableStorag } func (s *server) Read(req *bs.ReadRequest, srv bs.ByteStream_ReadServer) error { + log.Debugf("received ReadRequest for %+v", req.GetResourceName()) hash, err := s.bytestreamBlobName(req.ResourceName) if err != nil { return err @@ -565,6 +568,7 @@ func (s *server) assetHash(quals []*apb.Qualifier) string { } func (s *server) Execute(req *pb.ExecuteRequest, stream pb.Execution_ExecuteServer) error { + log.Debugf("received ExecuteRequest for %+v", req.GetActionDigest()) return s.exeReplicator.SequentialDigest(req.ActionDigest, func(srv *trie.Server) error { client, err := srv.Exe.Execute(s.forwardMetadata(stream.Context()), req) if err != nil { From 70cbee3f333bd475fec389b75aa75fc0b0e8653b Mon Sep 17 00:00:00 2001 From: maxime Date: Mon, 23 Sep 2024 17:17:42 +0100 Subject: [PATCH 2/2] Bump version to 11.11.2. --- ChangeLog | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 20c9486b..d93ef799 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 11.11.2 +--------------- + * Add some debug logs to flair. + Version 11.11.1 --------------- * Add keepalive config to gRPC dial parameters diff --git a/VERSION b/VERSION index ef772f7a..5866bfb2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.11.1 +11.11.2