wip

Author: sagor999

components/content-service/pkg/initializer/snapshot.go

@@ -10,7 +10,6 @@ import (
 	"github.com/opentracing/opentracing-go"
 	"golang.org/x/xerrors"
 
-	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/tracing"
 	csapi "github.com/gitpod-io/gitpod/content-service/api"
 	"github.com/gitpod-io/gitpod/content-service/pkg/archive"
@@ -33,9 +32,7 @@ func (s *SnapshotInitializer) Run(ctx context.Context, mappings []archive.IDMapp
 
 	src = csapi.WorkspaceInitFromBackup
 
-	log.Infof("SnapshotInitializer Run: %s, %s, %v", s.Location, s.Snapshot, mappings)
 	ok, err := s.Storage.DownloadSnapshot(ctx, s.Location, s.Snapshot, mappings)
-	log.Infof("SnapshotInitializer Run result: ok: %v, err: %v", ok, err)
 	if err != nil {
 		return src, xerrors.Errorf("snapshot initializer: %w", err)
 	}

components/content-service/pkg/storage/gcloud.go

@@ -191,7 +191,6 @@ func (rs *DirectGCPStorage) download(ctx context.Context, destination string, bk
 	defer tracing.FinishSpan(span, &err)
 
 	rc, _, err := rs.ObjectAccess(ctx, bkt, obj)
-	log.Infof("rc: %v, err: %v", rc, err)
 	if rc == nil {
 		return false, err
 	}
@@ -257,14 +256,11 @@ func (rs *DirectGCPStorage) Download(ctx context.Context, destination string, na
 
 // DownloadSnapshot downloads a snapshot. The snapshot name is expected to be one produced by Qualify
 func (rs *DirectGCPStorage) DownloadSnapshot(ctx context.Context, destination string, name string, mappings []archive.IDMapping) (bool, error) {
-	log.Info("GCP DownloadSnapshot")
 	bkt, obj, err := ParseSnapshotName(name)
 	if err != nil {
 		return false, err
 	}
 
-	log.Infof("bkt: %s, obj: %s", bkt, obj)
-
 	return rs.download(ctx, destination, bkt, obj, mappings)
 }
 

components/content-service/pkg/storage/minio.go

@@ -204,7 +204,6 @@ func (rs *DirectMinIOStorage) download(ctx context.Context, destination string,
 	defer tracing.FinishSpan(span, &err)
 
 	rc, err := rs.ObjectAccess(ctx, bkt, obj)
-	log.Infof("ObjectAccess: %v, %v", rc, err)
 	if rc == nil {
 		return false, err
 	}
@@ -225,12 +224,10 @@ func (rs *DirectMinIOStorage) Download(ctx context.Context, destination string,
 
 // DownloadSnapshot downloads a snapshot. The snapshot name is expected to be one produced by Qualify
 func (rs *DirectMinIOStorage) DownloadSnapshot(ctx context.Context, destination string, name string, mappings []archive.IDMapping) (bool, error) {
-	log.Infof("minio DownloadSnapshot")
 	bkt, obj, err := ParseSnapshotName(name)
 	if err != nil {
 		return false, err
 	}
-	log.Infof("bkt %s, obj %s", bkt, obj)
 
 	return rs.download(ctx, destination, bkt, obj, mappings)
 }

components/content-service/pkg/storage/namedurl.go

@@ -10,7 +10,6 @@ import (
 
 	"golang.org/x/xerrors"
 
-	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/content-service/pkg/archive"
 )
 
@@ -53,6 +52,5 @@ func (d *NamedURLDownloader) Download(ctx context.Context, destination string, n
 
 // DownloadSnapshot downloads a snapshot.
 func (d *NamedURLDownloader) DownloadSnapshot(ctx context.Context, destination string, name string, mappings []archive.IDMapping) (found bool, err error) {
-	log.Info("NamedURLDownloader")
 	return d.Download(ctx, destination, name, mappings)
 }

components/ws-daemon/pkg/content/initializer.go

@@ -68,9 +68,7 @@ var (
 func collectRemoteContent(ctx context.Context, rs storage.DirectAccess, ps storage.PresignedAccess, workspaceOwner string, initializer *csapi.WorkspaceInitializer) (rc map[string]storage.DownloadInfo, err error) {
 	rc = make(map[string]storage.DownloadInfo)
 
-	log.Infof("collectRemoteContent: %s, %s", workspaceOwner, storage.DefaultBackup)
 	backup, err := ps.SignDownload(ctx, rs.Bucket(workspaceOwner), rs.BackupObject(storage.DefaultBackup), &storage.SignedURLOptions{})
-	log.Infof("ps.SignDownload result: %v, %v", backup, err)
 	if err == storage.ErrNotFound {
 		// no backup found - that's fine
 	} else if err != nil {
@@ -79,12 +77,9 @@ func collectRemoteContent(ctx context.Context, rs storage.DirectAccess, ps stora
 		rc[storage.DefaultBackup] = *backup
 	}
 
-	log.Infof("Initializer=%v", initializer)
-
 	si := initializer.GetSnapshot()
 	pi := initializer.GetPrebuild()
 	if ci := initializer.GetComposite(); ci != nil {
-		log.Infof("Composite initializer")
 		for _, c := range ci.Initializer {
 			if c.GetSnapshot() != nil {
 				si = c.GetSnapshot()
@@ -96,12 +91,10 @@ func collectRemoteContent(ctx context.Context, rs storage.DirectAccess, ps stora
 	}
 	if si != nil {
 		bkt, obj, err := storage.ParseSnapshotName(si.Snapshot)
-		log.Infof("ParseSnapshotName: %s, %s, %s", si.Snapshot, bkt, obj)
 		if err != nil {
 			return nil, err
 		}
 		info, err := ps.SignDownload(ctx, bkt, obj, &storage.SignedURLOptions{})
-		log.Infof("ps.SignDownload: %v, %v", info, err)
 		if err == storage.ErrNotFound {
 			return nil, errCannotFindSnapshot
 		}
@@ -385,12 +378,7 @@ func (rs *remoteContentStorage) EnsureExists(ctx context.Context) error {
 
 // Download always returns false and does nothing
 func (rs *remoteContentStorage) Download(ctx context.Context, destination string, name string, mappings []archive.IDMapping) (exists bool, err error) {
-	log.Infof("Download: name: %s", name)
-	for k, v := range rs.RemoteContent {
-		log.Infof("RemoteContent[%s]=%v", k, v)
-	}
 	info, exists := rs.RemoteContent[name]
-	log.Infof("Download: %v, %v", info, exists)
 	if !exists {
 		return false, nil
 	}
@@ -411,7 +399,6 @@ func (rs *remoteContentStorage) Download(ctx context.Context, destination string
 
 // DownloadSnapshot always returns false and does nothing
 func (rs *remoteContentStorage) DownloadSnapshot(ctx context.Context, destination string, name string, mappings []archive.IDMapping) (bool, error) {
-	log.Infof("DownloadSnapshot: %s, %s", destination, name)
 	return rs.Download(ctx, destination, name, mappings)
 }
 

components/ws-daemon/pkg/content/service.go

@@ -197,7 +197,6 @@ func (s *WorkspaceService) InitWorkspace(ctx context.Context, req *api.InitWorks
 			}
 
 			remoteContent, err = collectRemoteContent(ctx, rs, ps, workspace.Owner, req.Initializer)
-			log.Infof("collectRemoteContent error: %v", err)
 			if err != nil && errors.Is(err, errCannotFindSnapshot) {
 				log.WithError(err).Error("cannot find snapshot")
 				return nil, status.Error(codes.NotFound, "cannot find snapshot")