update. lsshfs debug now

Author: blacknon

demo/e2e_test.go

@@ -219,8 +219,9 @@ func testDemoProxyAndForwarding(t *testing.T, demoDir string) {
 		if err == nil {
 			t.Fatalf("expected lsshfs missing path mount to fail\noutput:\n%s", output)
 		}
-		if strings.Contains(output, "/home/demo/mnt/lsshfs-missing") {
-			t.Fatalf("unexpected mount record/output for missing path\noutput:\n%s", output)
+		records, listErr := runClientCommand(demoDir, "lsshfs --list-mounts")
+		if listErr == nil && strings.Contains(records, "/home/demo/mnt/lsshfs-missing") {
+			t.Fatalf("unexpected mount record for missing path\ncommand output:\n%s\nlist-mounts:\n%s", output, records)
 		}
 	})
 
@@ -449,7 +450,7 @@ func startDemoLsshfsMount(t *testing.T, demoDir, remotePath, mountPoint, logPath
 	deadline := time.Now().Add(20 * time.Second)
 	for time.Now().Before(deadline) {
 		output, err := runClientCommand(demoDir,
-			fmt.Sprintf("grep -F %q /proc/mounts && lsshfs --list-mounts", mountPoint),
+			fmt.Sprintf("grep -F %q /proc/mounts && lsshfs --list-mounts | grep -F %q", mountPoint, mountPoint),
 		)
 		if err == nil && strings.Contains(output, mountPoint) {
 			return

internal/lsshfs/backend.go

@@ -158,28 +158,6 @@ func waitForMountActive(goos, mountpoint string, timeout time.Duration) error {
 	return fmt.Errorf("mount did not become active: %s", mountpoint)
 }
 
-func probeMountedFS(goos, mountpoint string, timeout time.Duration) error {
-	if goos != "linux" {
-		return nil
-	}
-
-	done := make(chan error, 1)
-	go func() {
-		_, err := os.ReadDir(mountpoint)
-		done <- err
-	}()
-
-	select {
-	case err := <-done:
-		if err != nil {
-			return fmt.Errorf("mounted filesystem is not responding: %s: %w", mountpoint, err)
-		}
-		return nil
-	case <-time.After(timeout):
-		return fmt.Errorf("mounted filesystem is not responding: %s", mountpoint)
-	}
-}
-
 func isMountActive(goos, mountpoint string) (bool, error) {
 	switch goos {
 	case "linux":

internal/lsshfs/runner.go

@@ -41,7 +41,6 @@ type Runner struct {
 	execCommand           func(name string, args ...string) *exec.Cmd
 	createConnect         func(*Runner) (mountConn, error)
 	waitForMountActive    func(goos, mountpoint string, timeout time.Duration) error
-	probeMountedFS        func(goos, mountpoint string, timeout time.Duration) error
 	aliveCheckInterval    time.Duration
 	aliveFailureLimit     int
 	signalCh              <-chan os.Signal
@@ -71,9 +70,6 @@ func (r *Runner) Run() error {
 	if r.waitForMountActive == nil {
 		r.waitForMountActive = waitForMountActive
 	}
-	if r.probeMountedFS == nil {
-		r.probeMountedFS = probeMountedFS
-	}
 	if r.GOOS == "" {
 		r.GOOS = currentGOOS
 	}
@@ -184,12 +180,6 @@ func (r *Runner) Run() error {
 		cleanup()
 		return err
 	}
-	if backend == BackendFUSE {
-		if err := r.probeMountedFS(r.GOOS, r.MountPoint, defaultMountActiveTimeout); err != nil {
-			cleanup()
-			return err
-		}
-	}
 
 	if r.ReadyNotifier != nil {
 		r.ReadyNotifier()

internal/lsshfs/runner_behavior_test.go

@@ -90,12 +90,6 @@ func TestRunnerRunWaitsForMountBeforeReady(t *testing.T) {
 			}
 			return nil
 		},
-		probeMountedFS: func(goos, mountpoint string, timeout time.Duration) error {
-			if readyCalled {
-				t.Fatal("ready notifier called before mounted filesystem probe")
-			}
-			return nil
-		},
 		ReadyNotifier: func() {
 			readyCalled = true
 			close(done)
@@ -165,9 +159,6 @@ func TestRunnerRunUnmountsOnDisconnect(t *testing.T) {
 		waitForMountActive: func(goos, mountpoint string, timeout time.Duration) error {
 			return nil
 		},
-		probeMountedFS: func(goos, mountpoint string, timeout time.Duration) error {
-			return nil
-		},
 		execCommand: func(name string, args ...string) *exec.Cmd {
 			commands = append(commands, name+" "+strings.Join(args, " "))
 			return exec.Command("sh", "-c", "true")
@@ -227,9 +218,6 @@ func TestRunnerRunDoesNotUnmountOnSingleAliveFailure(t *testing.T) {
 		waitForMountActive: func(goos, mountpoint string, timeout time.Duration) error {
 			return nil
 		},
-		probeMountedFS: func(goos, mountpoint string, timeout time.Duration) error {
-			return nil
-		},
 		execCommand: func(name string, args ...string) *exec.Cmd {
 			return exec.Command("sh", "-c", "true")
 		},
@@ -263,39 +251,3 @@ func TestRunnerRunDoesNotUnmountOnSingleAliveFailure(t *testing.T) {
 		t.Fatalf("stderr = %q", stderr.String())
 	}
 }
-
-func TestRunnerRunReturnsErrorWhenMountedFilesystemProbeFails(t *testing.T) {
-	t.Setenv("XDG_CACHE_HOME", t.TempDir())
-
-	done := make(chan struct{})
-	var commands []string
-	runner := &Runner{
-		Host:       "web01",
-		RemotePath: "/srv/data",
-		MountPoint: t.TempDir(),
-		ReadWrite:  true,
-		GOOS:       "linux",
-		createConnect: func(r *Runner) (mountConn, error) {
-			return &fakeMountConn{fuseBlock: done}, nil
-		},
-		waitForMountActive: func(goos, mountpoint string, timeout time.Duration) error {
-			return nil
-		},
-		probeMountedFS: func(goos, mountpoint string, timeout time.Duration) error {
-			close(done)
-			return errors.New("probe timeout")
-		},
-		execCommand: func(name string, args ...string) *exec.Cmd {
-			commands = append(commands, name+" "+strings.Join(args, " "))
-			return exec.Command("sh", "-c", "true")
-		},
-	}
-
-	err := runner.Run()
-	if err == nil || !strings.Contains(err.Error(), "probe timeout") {
-		t.Fatalf("Run() error = %v", err)
-	}
-	if len(commands) == 0 {
-		t.Fatalf("expected cleanup command on probe failure")
-	}
-}