Logging for #4024

cs3org · Jun 30, 2023 · b7bab25 · b7bab25
1 parent 84c8fbd
commit b7bab25
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/internal/grpc/services/datatx/datatx.go b/internal/grpc/services/datatx/datatx.go
@@ -27,6 +27,7 @@ import (
 	txdriver "github.com/cs3org/reva/pkg/datatx"
 	txregistry "github.com/cs3org/reva/pkg/datatx/manager/registry"
 	repoRegistry "github.com/cs3org/reva/pkg/datatx/repository/registry"
+	"github.com/cs3org/reva/pkg/appctx"
 	"github.com/cs3org/reva/pkg/errtypes"
 	"github.com/cs3org/reva/pkg/rgrpc"
 	"github.com/cs3org/reva/pkg/rgrpc/status"
@@ -124,6 +125,8 @@ func (s *service) UnprotectedEndpoints() []string {
 
 func (s *service) CreateTransfer(ctx context.Context, req *datatx.CreateTransferRequest) (*datatx.CreateTransferResponse, error) {
 	txInfo, startTransferErr := s.txManager.CreateTransfer(ctx, req.SrcTargetUri, req.DestTargetUri)
+	log := appctx.GetLogger(ctx)
+	log.Debug().Msg("CreateTransfer in internal/grpc/services/datatx/datatx.go!")
 
 	// we always save the transfer regardless of start transfer outcome
 	// only then, if starting fails, can we try to restart it
@@ -135,6 +138,15 @@ func (s *service) CreateTransfer(ctx context.Context, req *datatx.CreateTransfer
 		ShareID:       req.GetShareId().OpaqueId,
 		UserID:        userID,
 	}
+
+	log.Debug().Msgf("CreateTransfer TxID '%s', SrcTargetURI '%s', DestTargetURI '%s', ShareID '%s', UserID '%s'@'%s'",
+		txInfo.GetId().OpaqueId,
+		req.SrcTargetUri,
+		req.DestTargetUri,
+		req.GetShareId().OpaqueId,
+		userID.OpaqueId,
+		userID.Idp)
+
 	if err := s.storageDriver.StoreTransfer(transfer); err != nil {
 		err = errors.Wrap(err, "datatx service: error NEW saving transfer share: "+datatx.Status_STATUS_INVALID.String())
 		return &datatx.CreateTransferResponse{

diff --git a/internal/grpc/services/gateway/datatx.go b/internal/grpc/services/gateway/datatx.go
@@ -22,12 +22,16 @@ import (
 	"context"
 
 	datatx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1"
+	"github.com/cs3org/reva/pkg/appctx"
 	"github.com/cs3org/reva/pkg/rgrpc/status"
 	"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
 	"github.com/pkg/errors"
 )
 
 func (s *svc) CreateTransfer(ctx context.Context, req *datatx.CreateTransferRequest) (*datatx.CreateTransferResponse, error) {
+	log := appctx.GetLogger(ctx)
+	log.Debug().Msg("CreateTransfer in grpc gateway!")
+
 	c, err := pool.GetDataTxClient(pool.Endpoint(s.c.DataTxEndpoint))
 	if err != nil {
 		err = errors.Wrap(err, "gateway: error calling GetDataTxClient")

diff --git a/pkg/datatx/manager/rclone/rclone.go b/pkg/datatx/manager/rclone/rclone.go
@@ -142,6 +142,8 @@ func getStorageManager(c *config) (repository.Repository, error) {
 // CreateTransfer creates a transfer job and returns a TxInfo object that includes a unique transfer id.
 // Specified target URIs are of form scheme://userinfo@host:port?name={path}
 func (driver *rclone) CreateTransfer(ctx context.Context, srcTargetURI string, dstTargetURI string) (*datatx.TxInfo, error) {
+	log := appctx.GetLogger(ctx)
+	log.Debug().Msg("CreateTransfer in pkg/datatx/manager/rclone/rclone.go!")
 	srcEp, err := driver.extractEndpointInfo(ctx, srcTargetURI)
 	if err != nil {
 		return nil, err
@@ -158,6 +160,8 @@ func (driver *rclone) CreateTransfer(ctx context.Context, srcTargetURI string, d
 	dstToken := destEp.token
 	// we always set the userinfo part of the destination url for rclone tpc push support
 	dstRemote := fmt.Sprintf("%s://%s@%s", destEp.endpointScheme, dstToken, destEp.endpoint)
+	log.Debug().Msgf("starting job srcRemote '%s', srcPath '%s', srcToken '%s', dstRemote '%s', dstPath '%s', dstToken '%s'",
+		srcRemote, srcPath, srcToken, dstRemote, dstPath, dstToken)
 
 	return driver.startJob(ctx, "", srcRemote, srcPath, srcToken, dstRemote, dstPath, dstToken)
 }