log

Author: sagor999

components/supervisor/pkg/supervisor/supervisor.go

@@ -239,6 +239,7 @@ func Run(options ...RunOption) {
 	gitpodConfigService := config.NewConfigService(cfg.RepoRoot+"/.gitpod.yml", cstate.ContentReady(), log.Log)
 	go gitpodConfigService.Watch(ctx)
 
+	log.Info("starting ports manager")
 	portMgmt := ports.NewManager(
 		createExposedPortsImpl(cfg, gitpodService),
 		&ports.PollingServedPortsObserver{
@@ -249,6 +250,7 @@ func Run(options ...RunOption) {
 		internalPorts...,
 	)
 
+	log.Info("finished ports manager")
 	if opts.RunGP {
 		cstate.MarkContentReady(csapi.WorkspaceInitFromOther)
 	} else {
@@ -257,6 +259,8 @@ func Run(options ...RunOption) {
 		go analyseConfigChanges(ctx, cfg, analytics, gitpodConfigService, gitpodService)
 	}
 
+	log.Info("termMux")
+
 	termMux := terminal.NewMux()
 	termMuxSrv := terminal.NewMuxTerminalService(termMux)
 	termMuxSrv.DefaultWorkdir = cfg.RepoRoot
@@ -278,6 +282,8 @@ func Run(options ...RunOption) {
 		Gid: gitpodGID,
 	}
 
+	log.Info("taskManager")
+
 	taskManager := newTasksManager(cfg, termMuxSrv, cstate, nil)
 
 	apiServices := []RegisterableService{
@@ -297,12 +303,14 @@ func Run(options ...RunOption) {
 	}
 	apiServices = append(apiServices, additionalServices...)
 
+	log.Info("installDotfiles")
 	if !cfg.isHeadless() {
 		// We need to checkout dotfiles first, because they may be changing the path which affects the IDE.
 		// TODO(cw): provide better feedback if the IDE start fails because of the dotfiles (provide any feedback at all).
 		installDotfiles(ctx, cfg, tokenService, childProcEnvvars)
 	}
 
+	log.Info("ideWG")
 	var ideWG sync.WaitGroup
 	ideWG.Add(1)
 	go startAndWatchIDE(ctx, cfg, &cfg.IDE, childProcEnvvars, &ideWG, cstate, ideReady, WebIDE)
@@ -1302,6 +1310,7 @@ func startSSHServer(ctx context.Context, cfg *Config, wg *sync.WaitGroup, childP
 }
 
 func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst ContentState) {
+	log.Info("starting content init")
 	defer wg.Done()
 	defer log.Info("supervisor: workspace content available")
 
@@ -1327,6 +1336,8 @@ func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst
 		log.Info("Detected content.json in /.workspace folder, assuming PVC feature enabled")
 	}
 
+	log.Infof("waiting for content.json to be available at %s", fn)
+
 	var contentFile *os.File
 
 	contentFile, err = os.Open(fn)
@@ -1341,6 +1352,7 @@ func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst
 		// TODO: rewrite using fsnotify
 		t := time.NewTicker(100 * time.Millisecond)
 		for range t.C {
+			log.Infof("waiting for %s to be available", fnReady)
 			b, err := os.ReadFile(fnReady)
 			if err != nil {
 				if !os.IsNotExist(err) {
@@ -1368,12 +1380,14 @@ func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst
 
 	defer contentFile.Close()
 
+	log.Info("supervisor: workspace content available")
 	var src csapi.WorkspaceInitSource
 	src, err = executor.Execute(ctx, "/workspace", contentFile, true)
 	if err != nil {
 		return
 	}
 
+	log.Infof("supervisor: remove %s", fn)
 	err = os.Remove(fn)
 	if os.IsNotExist(err) {
 		// file is gone - we're good