wip

Author: sagor999

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

@@ -56,7 +56,6 @@ func (ws *fileDownloadInitializer) Run(ctx context.Context, mappings []archive.I
 			return src, err
 		}
 	}
-	log.Info("fileDownloadInitializer run")
 	return csapi.WorkspaceInitFromOther, nil
 }
 

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

@@ -64,7 +64,6 @@ func (ws *GitInitializer) Run(ctx context.Context, mappings []archive.IDMapping)
 	span.SetTag("isGitWS", isGitWS)
 	defer tracing.FinishSpan(span, &err)
 
-	log.Info("GitInitializer run")
 	src = csapi.WorkspaceInitFromOther
 	if isGitWS {
 		log.WithField("stage", "init").WithField("location", ws.Location).Info("Not running git clone. Workspace is already a Git workspace")

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

@@ -55,7 +55,6 @@ type EmptyInitializer struct{}
 
 // Run does nothing
 func (e *EmptyInitializer) Run(ctx context.Context, mappings []archive.IDMapping) (csapi.WorkspaceInitSource, error) {
-	log.Info("empty initializer")
 	return csapi.WorkspaceInitFromOther, nil
 }
 
@@ -65,7 +64,6 @@ type CompositeInitializer []Initializer
 // Run calls run on all child initializers
 func (e CompositeInitializer) Run(ctx context.Context, mappings []archive.IDMapping) (_ csapi.WorkspaceInitSource, err error) {
 	span, ctx := opentracing.StartSpanFromContext(ctx, "CompositeInitializer.Run")
-	log.Info("composite initializer")
 	defer tracing.FinishSpan(span, &err)
 	for _, init := range e {
 		_, err := init.Run(ctx, mappings)
@@ -391,7 +389,6 @@ func InitializeWorkspace(ctx context.Context, location string, remoteStorage sto
 		o(&cfg)
 	}
 
-	log.Info("InitializeWorkspace")
 	src = csapi.WorkspaceInitFromOther
 
 	// Note: it's important that CleanSlate does not remove the location itself, but merely its content.
@@ -435,11 +432,9 @@ func InitializeWorkspace(ctx context.Context, location string, remoteStorage sto
 
 	span.SetTag("hasBackup", hasBackup)
 	if hasBackup {
-		log.Info("has backup")
 		src = csapi.WorkspaceInitFromBackup
 	} else {
 		src, err = cfg.Initializer.Run(ctx, cfg.mappings)
-		log.Infof("src from initializer run: %v", src)
 		if err != nil {
 			return src, xerrors.Errorf("cannot initialize workspace: %w", err)
 		}
@@ -491,7 +486,6 @@ func EnsureCleanDotGitpodDirectory(ctx context.Context, wspath string) error {
 
 // PlaceWorkspaceReadyFile writes a file in the workspace which indicates that the workspace has been initialized
 func PlaceWorkspaceReadyFile(ctx context.Context, wspath string, initsrc csapi.WorkspaceInitSource, uid, gid int) (err error) {
-	log.Infof("PlaceWorkspaceReadyFile: %s, %v", wspath, initsrc)
 	//nolint:ineffassign,staticcheck
 	span, ctx := opentracing.StartSpanFromContext(ctx, "placeWorkspaceReadyFile")
 	span.SetTag("source", initsrc)

components/content-service/pkg/layer/provider.go

@@ -290,7 +290,6 @@ func (s *Provider) GetContentLayerPVC(ctx context.Context, owner, workspaceID st
 	// At this point we've found neither a full-workspace-backup, nor a legacy backup.
 	// It's time to use the initializer.
 	if gis := initializer.GetSnapshot(); gis != nil {
-		log.Infof("GetContentLayerPVC: GetSnapshot. %v", gis.FromVolumeSnapshot)
 		if gis.FromVolumeSnapshot {
 			layer, err = contentDescriptorToLayerPVC([]byte{})
 			if err != nil {
@@ -307,7 +306,6 @@ func (s *Provider) GetContentLayerPVC(ctx context.Context, owner, workspaceID st
 		return s.getSnapshotContentLayer(ctx, gis)
 	}
 	if pis := initializer.GetPrebuild(); pis != nil {
-		log.Infof("GetContentLayerPVC: GetPrebuild. %v", pis.Prebuild.FromVolumeSnapshot)
 		if pis.Prebuild.FromVolumeSnapshot {
 			layer, err = contentDescriptorToLayerPVC([]byte{})
 			if err != nil {
@@ -413,7 +411,7 @@ func (s *Provider) getSnapshotContentLayer(ctx context.Context, sp *csapi.Snapsh
 	}
 
 	// we've found a manifest for this fwb snapshot - let's use it
-	l, err = s.layerFromContentManifest(ctx, manifest, csapi.WorkspaceInitFromPrebuild, true)
+	l, err = s.layerFromContentManifest(ctx, manifest, csapi.WorkspaceInitFromOther, true)
 	return l, manifest, nil
 }
 
@@ -422,8 +420,6 @@ func (s *Provider) getPrebuildContentLayer(ctx context.Context, pb *csapi.Prebui
 	defer tracing.FinishSpan(span, &err)
 	span.LogKV("isPVC", isPVC)
 
-	log.Infof("getPrebuildContentLayer: %v", isPVC)
-
 	segs := strings.Split(pb.Prebuild.Snapshot, "@")
 	if len(segs) != 2 {
 		return nil, nil, xerrors.Errorf("invalid snapshot FQN: %s", pb.Prebuild.Snapshot)
@@ -487,7 +483,6 @@ func (s *Provider) getPrebuildContentLayer(ctx context.Context, pb *csapi.Prebui
 }
 
 func (s *Provider) layerFromContentManifest(ctx context.Context, mf *csapi.WorkspaceContentManifest, initsrc csapi.WorkspaceInitSource, ready bool) (l []Layer, err error) {
-	log.Infof("layerFromContentManifest: %v, %v", ready, initsrc)
 	// we have a valid full workspace backup
 	l = make([]Layer, len(mf.Layers))
 	for i, mfl := range mf.Layers {
@@ -540,22 +535,19 @@ var pvcEnabledFile = `PVC`
 // we cannot use /workspace folder as when mounting /workspace folder through PVC
 // it will mask anything that was in container layer, hence we are using /.workspace instead here
 func contentDescriptorToLayerPVC(cdesc []byte) (*Layer, error) {
-	log.Info("contentDescriptorToLayerPVC")
 	layers := []fileInLayer{
 		{&tar.Header{Typeflag: tar.TypeDir, Name: "/.workspace", Uid: initializer.GitpodUID, Gid: initializer.GitpodGID, Mode: 0755}, nil},
 		{&tar.Header{Typeflag: tar.TypeDir, Name: "/.workspace/.gitpod", Uid: initializer.GitpodUID, Gid: initializer.GitpodGID, Mode: 0755}, nil},
 		{&tar.Header{Typeflag: tar.TypeReg, Name: "/.workspace/.gitpod/pvc", Uid: 0, Gid: 0, Mode: 0775, Size: int64(len(pvcEnabledFile))}, []byte(pvcEnabledFile)},
 		{&tar.Header{Typeflag: tar.TypeReg, Name: "/.supervisor/prestophook.sh", Uid: 0, Gid: 0, Mode: 0775, Size: int64(len(prestophookScript))}, []byte(prestophookScript)},
 	}
 	if len(cdesc) > 0 {
-		log.Infof("contentDescriptorToLayerPVC: %v", string(cdesc))
 		layers = append(layers, fileInLayer{&tar.Header{Typeflag: tar.TypeReg, Name: "/.workspace/.gitpod/content.json", Uid: initializer.GitpodUID, Gid: initializer.GitpodGID, Mode: 0755, Size: int64(len(cdesc))}, cdesc})
 	}
 	return layerFromContent(layers...)
 }
 
 func workspaceReadyLayerPVC(src csapi.WorkspaceInitSource) (*Layer, error) {
-	log.Infof("workspaceReadyLayerPVC: %v", src)
 	msg := csapi.WorkspaceReadyMessage{
 		Source: src,
 	}
@@ -572,7 +564,6 @@ func workspaceReadyLayerPVC(src csapi.WorkspaceInitSource) (*Layer, error) {
 }
 
 func workspaceReadyLayer(src csapi.WorkspaceInitSource) (*Layer, error) {
-	log.Infof("workspaceReadyLayer: %v", src)
 	msg := csapi.WorkspaceReadyMessage{
 		Source: src,
 	}

components/supervisor/pkg/supervisor/tasks.go

@@ -385,15 +385,13 @@ func getHistfileCommand(task *task, commands []*string, contentSource csapi.Work
 }
 
 func getCommands(task *task, isHeadless bool, contentSource csapi.WorkspaceInitSource, storeLocation string) []*string {
-	log.Infof("getCommands: %v", contentSource)
 	if isHeadless {
 		// prebuild
 		return []*string{task.config.Before, task.config.Init, task.config.Prebuild}
 	}
 	if contentSource == csapi.WorkspaceInitFromPrebuild {
 		// prebuilt
 		prebuildLogFileName := prebuildLogFileName(task, storeLocation)
-		log.Infof("getCommands: prebuild: %s", prebuildLogFileName)
 		legacyPrebuildLogFileName := logs.LegacyPrebuildLogFileName(task.Id)
 		printlogs := "[ -r " + legacyPrebuildLogFileName + " ] && cat " + legacyPrebuildLogFileName + "; [ -r " + prebuildLogFileName + " ] && cat " + prebuildLogFileName + "; true"
 		return []*string{task.config.Before, &printlogs, task.config.Command}
@@ -430,7 +428,6 @@ func (tm *tasksManager) watch(task *task, term *terminal.Term) {
 			fileName    = prebuildLogFileName(task, tm.storeLocation)
 			oldFileName = fileName + "-old"
 		)
-		log.Infof("writing prebuild logs to %s", fileName)
 		if _, err := os.Stat(fileName); err == nil {
 			// If the file already exists (from a parent prebuild), temporarily move it so that it doesn't get truncated.
 			// On the off chance that renaming fails here, we silently ignore that -- the new prebuild logs simply won't reflect
@@ -489,9 +486,7 @@ func (tm *tasksManager) watch(task *task, term *terminal.Term) {
 }
 
 func importParentLogAndGetDuration(fn string, out io.Writer) time.Duration {
-	log.Infof("Importing parent prebuild log from %s", fn)
 	if _, err := os.Stat(fn); err != nil {
-		log.Info("No parent prebuild log found")
 		return 0
 	}
 	defer os.Remove(fn)