fix: ignore EINVAL when fsyncing /dev/stdout

coadler · coadler · commit 761e678d1f98 · 2023-01-10T00:17:01.000-06:00
Fixes: #5532
diff --git a/cli/scaletest.go b/cli/scaletest.go
@@ -9,6 +9,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"syscall"
 	"time"
 
 	"github.com/google/uuid"
@@ -185,7 +186,9 @@ func (o *scaleTestOutput) write(res harness.Results, stdout io.Writer) error {
 	// Sync the file to disk if it's a file.
 	if s, ok := w.(interface{ Sync() error }); ok {
 		err := s.Sync()
-		if err != nil {
+		// On Linux, EINVAL is returned when calling fsync on /dev/stdout. We
+		// can safely ignore this error.
+		if err != nil && !xerrors.Is(err, syscall.EINVAL) {
 			return xerrors.Errorf("flush output file: %w", err)
 		}
 	}
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
@@ -31,16 +31,6 @@ variable "namespace" {
   description = "The namespace to create workspaces in (must exist prior to creating workspaces)"
 }
 
-variable "home_disk_size" {
-  type        = number
-  description = "How large would you like your home volume to be (in GB)?"
-  default     = 10
-  validation {
-    condition     = var.home_disk_size >= 1
-    error_message = "Value must be greater than or equal to 1."
-  }
-}
-
 provider "kubernetes" {
   # Authenticate via ~/.kube/config or a Coder-specific ServiceAccount, depending on admin preferences
   config_path = var.use_kubeconfig == true ? "~/.kube/config" : null
@@ -85,22 +75,6 @@ resource "coder_app" "code-server" {
   }
 }
 
-resource "kubernetes_persistent_volume_claim" "home" {
-  metadata {
-    name      = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}-home"
-    namespace = var.namespace
-  }
-  wait_until_bound = false
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "${var.home_disk_size}Gi"
-      }
-    }
-  }
-}
-
 resource "kubernetes_pod" "main" {
   count = data.coder_workspace.me.start_count
   metadata {
@@ -123,19 +97,6 @@ resource "kubernetes_pod" "main" {
         name  = "CODER_AGENT_TOKEN"
         value = coder_agent.main.token
       }
-      volume_mount {
-        mount_path = "/home/coder"
-        name       = "home"
-        read_only  = false
-      }
-    }
-
-    volume {
-      name = "home"
-      persistent_volume_claim {
-        claim_name = kubernetes_persistent_volume_claim.home.metadata.0.name
-        read_only  = false
-      }
     }
   }
 }
