tests: start container after initial sync

Author: FabianKramm

cmd/sync.go

@@ -307,10 +307,10 @@ func (cmd *SyncCmd) applyFlagsToSyncConfig(syncConfig *latest.SyncConfig, option
 		syncConfig.ExcludePaths = cmd.Exclude
 	}
 	if cmd.UploadOnly {
-		syncConfig.DisableDownload = &cmd.UploadOnly
+		syncConfig.DisableDownload = cmd.UploadOnly
 	}
 	if cmd.DownloadOnly {
-		syncConfig.DisableUpload = &cmd.DownloadOnly
+		syncConfig.DisableUpload = cmd.DownloadOnly
 	}
 
 	// if selection is specified through flags, we don't want to use the loaded

e2e/tests/replacepods/replacepods.go

@@ -66,6 +66,9 @@ var _ = DevSpaceDescribe("replacepods", func() {
 			done <- err
 		}()
 
+		// check if file is there
+		framework.ExpectRemoteFileContents("ubuntu", ns, "/app/test2.txt", "Hello World 123")
+
 		// check if file is there
 		framework.ExpectRemoteFileContents("ubuntu", ns, "/test.txt", "Hello World\n")
 

e2e/tests/replacepods/testdata/restart-helper/test2.txt

@@ -0,0 +1 @@
+Hello World 123

pkg/devspace/build/builder/restart/restart.go

@@ -13,6 +13,10 @@ var LegacyScriptPath = "/" + ScriptName
 // ScriptPath is the absolute path of the restart script in the container
 var ScriptPath = "/.devspace/" + ScriptName
 
+// TouchPath is the absolute path of the touch file that signals initial syncing is done
+// and the container can start
+var TouchPath = "/.devspace/start"
+
 // ScriptContextPath is the absolute path of the restart script in the build context
 var ScriptContextPath = "/.devspace/.devspace/" + ScriptName
 
@@ -39,6 +43,7 @@ tmpDir="/.devspace"
 screenLogFile="$tmpDir/screenlog.0"
 pidFile="$tmpDir/devspace-pid"
 sidFile="$tmpDir/devspace-sid"
+touchFile="$tmpDir/start"
 
 mkdir -p $tmpDir
 
@@ -61,6 +66,10 @@ quit() {
   fi
 }
 
+until [ -f $touchFile ]; do
+     sleep 1
+done
+
 while $restart; do
   set +e
   if command -v screen >/dev/null; then

pkg/devspace/config/versions/v1beta11/upgrade.go

@@ -641,11 +641,15 @@ func (c *Config) mergeDevConfig(log log.Logger) (map[string]*next.DevPod, error)
 			UploadExcludeFile:    syncConfig.UploadExcludeFile,
 			InitialSync:          next.InitialSyncStrategy(syncConfig.InitialSync),
 			InitialSyncCompareBy: next.InitialSyncCompareBy(syncConfig.InitialSyncCompareBy),
-			DisableDownload:      syncConfig.DisableDownload,
-			DisableUpload:        syncConfig.DisableUpload,
 			Polling:              syncConfig.Polling,
 			WaitInitialSync:      syncConfig.WaitInitialSync,
 		}
+		if syncConfig.DisableDownload != nil {
+			nextSyncConfig.DisableDownload = *syncConfig.DisableDownload
+		}
+		if syncConfig.DisableUpload != nil {
+			nextSyncConfig.DisableUpload = *syncConfig.DisableUpload
+		}
 		syncPath := "."
 		if syncConfig.LocalSubPath != "" {
 			syncPath = syncConfig.LocalSubPath

pkg/devspace/services/sync/controller.go

@@ -331,16 +331,8 @@ func (c *controller) initClient(ctx *devspacecontext.Context, pod *v1.Pod, arch,
 		return nil, err
 	}
 
-	upstreamDisabled := false
-	if syncConfig.DisableUpload != nil {
-		upstreamDisabled = *syncConfig.DisableUpload
-	}
-
-	downstreamDisabled := false
-	if syncConfig.DisableDownload != nil {
-		downstreamDisabled = *syncConfig.DisableDownload
-	}
-
+	upstreamDisabled := syncConfig.DisableUpload
+	downstreamDisabled := syncConfig.DisableDownload
 	compareBy := latest.InitialSyncCompareByMTime
 	if syncConfig.InitialSyncCompareBy != "" {
 		compareBy = syncConfig.InitialSyncCompareBy

pkg/devspace/sync/upstream.go

@@ -6,6 +6,7 @@ import (
 	"compress/gzip"
 	"context"
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/devspace/build/builder/restart"
 	"github.com/loft-sh/devspace/pkg/devspace/pipeline/engine"
 	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"io"
@@ -29,6 +30,10 @@ import (
 	"github.com/pkg/errors"
 )
 
+var (
+	TouchFile = ""
+)
+
 type upstream struct {
 	events   chan notify.EventInfo
 	symlinks map[string]*Symlink
@@ -49,6 +54,7 @@ type upstream struct {
 	initialSyncCompletedMutex sync.Mutex
 	initialSyncChanges        []string
 	initialSyncCompleted      bool
+	initialSyncTouchOnce      sync.Once
 }
 
 const (
@@ -249,10 +255,22 @@ func (u *upstream) mainLoop() error {
 	}
 }
 
-func (u *upstream) execCommandsAfterInitialSync() error {
+func (u *upstream) execCommandsAfterInitialSync() (err error) {
 	u.initialSyncCompletedMutex.Lock()
 	defer u.initialSyncCompletedMutex.Unlock()
 
+	// make sure the touch file is there
+	defer func() {
+		if err == nil && u.sync.Options.RestartContainer && u.initialSyncCompleted {
+			u.initialSyncTouchOnce.Do(func() {
+				_, err = u.client.Execute(u.sync.ctx, &remote.Command{
+					Cmd:  "touch",
+					Args: []string{restart.TouchPath},
+				})
+			})
+		}
+	}()
+
 	if !u.initialSyncCompleted || len(u.initialSyncChanges) == 0 {
 		return nil
 	}