plugin: do not reopen fifos on recover task (#63)

* plugin: do not reopen fifos on recover task

* handle: set the clock in recover handle

pkg/pledge/exec_test.go

@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io"
 	"os"
 	"os/user"
 	"testing"
 
 	"github.com/shoenig/nomad-pledge/pkg/resources"
+	"github.com/shoenig/nomad-pledge/pkg/util"
 	"github.com/shoenig/test/must"
 )
 
@@ -25,18 +25,6 @@ func lookupBin() string {
 	return defaultPledgeBin
 }
 
-type writeCloser struct {
-	io.Writer
-}
-
-func (wc *writeCloser) Close() error {
-	return nil
-}
-
-func noopCloser(w io.Writer) io.WriteCloser {
-	return &writeCloser{w}
-}
-
 func whoami() string {
 	u, err := user.Current()
 	if err != nil {
@@ -50,8 +38,8 @@ func testEnv() (*Environment, *bytes.Buffer, *bytes.Buffer) {
 	var err bytes.Buffer
 
 	return &Environment{
-		Out:    noopCloser(&out),
-		Err:    noopCloser(&err),
+		Out:    util.NullCloser(&out),
+		Err:    util.NullCloser(&err),
 		Env:    map[string]string{},
 		Dir:    ".",
 		User:   whoami(),

pkg/plugin/driver.go

@@ -330,7 +330,7 @@ func (p *PledgeDriver) RecoverTask(handle *drivers.TaskHandle) error {
 		return errors.New("failed to recover task, handle is nil")
 	}
 
-	p.logger.Warn("recovering task", "id", handle.Config.ID)
+	p.logger.Info("recovering task", "id", handle.Config.ID)
 
 	if _, exists := p.tasks.Get(handle.Config.ID); exists {
 		return nil // nothing to do
@@ -342,16 +342,11 @@ func (p *PledgeDriver) RecoverTask(handle *drivers.TaskHandle) error {
 	}
 
 	taskState.TaskConfig = handle.Config.Copy()
-	stdout, stderr, err := open(handle.Config.StdoutPath, handle.Config.StderrPath)
-	if err != nil {
-		p.logger.Error("failed to re-open log files", "error", err)
-		return fmt.Errorf("failed to open log file(s): %w", err)
-	}
 
 	// re-create the environment for pledge
 	env := &pledge.Environment{
-		Out:    stdout,
-		Err:    stderr,
+		Out:    util.NullCloser(nil),
+		Err:    util.NullCloser(nil),
 		Env:    handle.Config.Env,
 		Dir:    handle.Config.TaskDir().Dir,
 		User:   handle.Config.User,
@@ -377,9 +372,7 @@ func (p *PledgeDriver) WaitTask(ctx context.Context, taskID string) (<-chan *dri
 	ch := make(chan *drivers.ExitResult)
 	go func() {
 		// todo: able to cancel ?
-		p.logger.Debug("WaitTask start Block")
 		handle.Block()
-		p.logger.Debug("WaitTask done Block")
 		result := handle.Status()
 		ch <- result.ExitResult
 	}()

pkg/task/handle.go

@@ -40,11 +40,13 @@ func NewHandle(runner pledge.Exec, config *drivers.TaskConfig) (*Handle, time.Ti
 }
 
 func RecreateHandle(runner pledge.Exec, config *drivers.TaskConfig, started time.Time) *Handle {
+	clock := libtime.SystemClock()
 	return &Handle{
 		pid:     runner.PID(),
 		runner:  runner,
 		config:  config,
 		state:   drivers.TaskStateUnknown,
+		clock:   clock,
 		started: started,
 		result:  new(drivers.ExitResult),
 	}

pkg/util/io.go

@@ -0,0 +1,17 @@
+package util
+
+import (
+	"io"
+)
+
+func NullCloser(w io.Writer) io.WriteCloser {
+	return &writeCloser{w}
+}
+
+type writeCloser struct {
+	io.Writer
+}
+
+func (*writeCloser) Close() error {
+	return nil
+}