[content-service] Log filesystem usage error

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

@@ -49,9 +49,9 @@ func (ws *fileDownloadInitializer) Run(ctx context.Context, mappings []archive.I
 	span, ctx := opentracing.StartSpanFromContext(ctx, "FileDownloadInitializer.Run")
 	defer tracing.FinishSpan(span, &err)
 	start := time.Now()
-	initialSize, diskErr := getDiskUsage()
-	if diskErr != nil {
-		log.WithError(err).Error("could not get disk usage")
+	initialSize, fsErr := getFsUsage()
+	if fsErr != nil {
+		log.WithError(fsErr).Error("could not get disk usage")
 	}
 
 	for _, info := range ws.FilesInfos {
@@ -62,10 +62,10 @@ func (ws *fileDownloadInitializer) Run(ctx context.Context, mappings []archive.I
 		}
 	}
 
-	if diskErr == nil {
-		currentSize, diskErr := getDiskUsage()
-		if diskErr != nil {
-			log.WithError(err).Error("could not get disk usage")
+	if fsErr == nil {
+		currentSize, fsErr := getFsUsage()
+		if fsErr != nil {
+			log.WithError(fsErr).Error("could not get disk usage")
 		}
 
 		metrics = csapi.InitializerMetrics{csapi.InitializerMetric{

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

@@ -64,9 +64,9 @@ func (ws *GitInitializer) Run(ctx context.Context, mappings []archive.IDMapping)
 	span.SetTag("isGitWS", isGitWS)
 	defer tracing.FinishSpan(span, &err)
 	start := time.Now()
-	initialSize, diskErr := getDiskUsage()
-	if diskErr != nil {
-		log.WithError(err).Error("could not get disk usage")
+	initialSize, fsErr := getFsUsage()
+	if fsErr != nil {
+		log.WithError(fsErr).Error("could not get disk usage")
 	}
 
 	src = csapi.WorkspaceInitFromOther
@@ -177,10 +177,10 @@ func (ws *GitInitializer) Run(ctx context.Context, mappings []archive.IDMapping)
 
 	log.WithField("stage", "init").WithField("location", ws.Location).Debug("Git operations complete")
 
-	if diskErr == nil {
-		currentSize, diskErr := getDiskUsage()
-		if diskErr != nil {
-			log.WithError(err).Error("could not get disk usage")
+	if fsErr == nil {
+		currentSize, fsErr := getFsUsage()
+		if fsErr != nil {
+			log.WithError(fsErr).Error("could not get disk usage")
 		}
 
 		stats = csapi.InitializerMetrics{csapi.InitializerMetric{

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

@@ -67,9 +67,9 @@ func (e CompositeInitializer) Run(ctx context.Context, mappings []archive.IDMapp
 	span, ctx := opentracing.StartSpanFromContext(ctx, "CompositeInitializer.Run")
 	defer tracing.FinishSpan(span, &err)
 	start := time.Now()
-	initialSize, diskErr := getDiskUsage()
-	if diskErr != nil {
-		log.WithError(err).Error("could not get disk usage")
+	initialSize, fsErr := getFsUsage()
+	if fsErr != nil {
+		log.WithError(fsErr).Error("could not get disk usage")
 	}
 
 	total := []csapi.InitializerMetric{}
@@ -81,10 +81,10 @@ func (e CompositeInitializer) Run(ctx context.Context, mappings []archive.IDMapp
 		total = append(total, stats...)
 	}
 
-	if diskErr == nil {
-		currentSize, diskErr := getDiskUsage()
-		if diskErr != nil {
-			log.WithError(err).Error("could not get disk usage")
+	if fsErr == nil {
+		currentSize, fsErr := getFsUsage()
+		if fsErr != nil {
+			log.WithError(fsErr).Error("could not get disk usage")
 		}
 
 		total = append(total, csapi.InitializerMetric{
@@ -215,9 +215,9 @@ func (bi *fromBackupInitializer) Run(ctx context.Context, mappings []archive.IDM
 	}
 
 	start := time.Now()
-	initialSize, diskErr := getDiskUsage()
-	if diskErr != nil {
-		log.WithError(err).Error("could not get disk usage")
+	initialSize, fsErr := getFsUsage()
+	if fsErr != nil {
+		log.WithError(fsErr).Error("could not get disk usage")
 	}
 
 	hasBackup, err := bi.RemoteStorage.Download(ctx, bi.Location, storage.DefaultBackup, mappings)
@@ -231,10 +231,10 @@ func (bi *fromBackupInitializer) Run(ctx context.Context, mappings []archive.IDM
 		return src, nil, xerrors.Errorf("cannot restore backup: %w", err)
 	}
 
-	if diskErr == nil {
-		currentSize, diskErr := getDiskUsage()
-		if diskErr != nil {
-			log.WithError(err).Error("could not get disk usage")
+	if fsErr == nil {
+		currentSize, fsErr := getFsUsage()
+		if fsErr != nil {
+			log.WithError(fsErr).Error("could not get disk usage")
 		}
 
 		stats = csapi.InitializerMetrics{csapi.InitializerMetric{
@@ -574,9 +574,14 @@ func PlaceWorkspaceReadyFile(ctx context.Context, wspath string, initsrc csapi.W
 	return nil
 }
 
-func getDiskUsage() (uint64, error) {
+func getFsUsage() (uint64, error) {
 	var stat syscall.Statfs_t
-	err := syscall.Statfs("/workspace", &stat)
+
+	err := syscall.Statfs("/dst", &stat)
+	if os.IsNotExist(err) {
+		err = syscall.Statfs("/workspace", &stat)
+	}
+
 	if err != nil {
 		return 0, err
 	}

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

@@ -39,9 +39,9 @@ func (p *PrebuildInitializer) Run(ctx context.Context, mappings []archive.IDMapp
 	span, ctx := opentracing.StartSpanFromContext(ctx, "PrebuildInitializer")
 	defer tracing.FinishSpan(span, &err)
 	startTime := time.Now()
-	initialSize, diskErr := getDiskUsage()
-	if diskErr != nil {
-		log.WithError(err).Error("could not get disk usage")
+	initialSize, fsErr := getFsUsage()
+	if fsErr != nil {
+		log.WithError(fsErr).Error("could not get disk usage")
 	}
 
 	var spandata []tracelog.Field
@@ -109,10 +109,10 @@ func (p *PrebuildInitializer) Run(ctx context.Context, mappings []archive.IDMapp
 	}
 	log.Debug("Initialized workspace with prebuilt snapshot")
 
-	if diskErr == nil {
-		currentSize, err := getDiskUsage()
+	if fsErr == nil {
+		currentSize, fsErr := getFsUsage()
 		if err != nil {
-			log.WithError(err).Error("could not get disk usage")
+			log.WithError(fsErr).Error("could not get disk usage")
 		}
 
 		stats = append(stats, csapi.InitializerMetric{

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

@@ -33,9 +33,9 @@ func (s *SnapshotInitializer) Run(ctx context.Context, mappings []archive.IDMapp
 	span.SetTag("snapshot", s.Snapshot)
 	defer tracing.FinishSpan(span, &err)
 	start := time.Now()
-	initialSize, diskErr := getDiskUsage()
-	if diskErr != nil {
-		log.WithError(err).Error("could not get disk usage")
+	initialSize, fsErr := getFsUsage()
+	if fsErr != nil {
+		log.WithError(fsErr).Error("could not get disk usage")
 	}
 
 	src = csapi.WorkspaceInitFromBackup
@@ -53,10 +53,10 @@ func (s *SnapshotInitializer) Run(ctx context.Context, mappings []archive.IDMapp
 		return src, nil, xerrors.Errorf("did not find snapshot %s", s.Snapshot)
 	}
 
-	if diskErr == nil {
-		currentSize, diskErr := getDiskUsage()
-		if diskErr == nil {
-			log.WithError(err).Error("could not get disk usage")
+	if fsErr == nil {
+		currentSize, fsErr := getFsUsage()
+		if fsErr == nil {
+			log.WithError(fsErr).Error("could not get disk usage")
 		}
 
 		stats = csapi.InitializerMetrics{csapi.InitializerMetric{

components/supervisor/pkg/metrics/reporter.go

@@ -40,7 +40,7 @@ func NewGrpcMetricsReporter(gitpodHost string) *GrpcMetricsReporter {
 			"grpc_server_started_total":           true,
 			"grpc_server_handling_seconds":        true,
 			"supervisor_ide_ready_duration_total": true,
-			"initializer_bytes_second":            true,
+			"supervisor_initializer_bytes_second": true,
 		},
 		values: make(map[string]float64),
 		addCounter: func(name string, labels map[string]string, value uint64) {

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

@@ -44,7 +44,7 @@ import (
 type metrics struct {
 	BackupWaitingTimeHist       prometheus.Histogram
 	BackupWaitingTimeoutCounter prometheus.Counter
-	InitializerHistogram        prometheus.HistogramVec
+	InitializerHistogram        *prometheus.HistogramVec
 }
 
 // WorkspaceService implements the InitService and WorkspaceService
@@ -130,7 +130,7 @@ func NewWorkspaceService(ctx context.Context, cfg Config, kubernetesNamespace st
 		metrics: &metrics{
 			BackupWaitingTimeHist:       waitingTimeHist,
 			BackupWaitingTimeoutCounter: waitingTimeoutCounter,
-			InitializerHistogram:        *initializerHistogram,
+			InitializerHistogram:        initializerHistogram,
 		},
 		// we permit five concurrent backups at any given time, hence the five in the channel
 		backupWorkspaceLimiter: make(chan struct{}, 5),