Default node start params

cmd/control/control.go

@@ -248,9 +248,6 @@ func newStartCommand() *cobra.Command {
 		false,
 		"true to assign dynamic ports",
 	)
-	if err := cmd.MarkPersistentFlagRequired("avalanchego-path"); err != nil {
-		panic(err)
-	}
 	return cmd
 }
 

local/network.go

@@ -15,7 +15,6 @@ import (
 	"regexp"
 	"strings"
 	"sync"
-	"syscall"
 	"time"
 
 	"github.com/ava-labs/avalanche-network-runner/api"
@@ -843,7 +842,6 @@ func (ln *localNetwork) pauseNode(ctx context.Context, nodeName string) error {
 	if exitCode := node.process.Stop(ctx); exitCode != 0 {
 		return fmt.Errorf("node %q exited with exit code: %d", nodeName, exitCode)
 	}
-	syscall.Sync()
 	node.paused = true
 	return nil
 }
@@ -964,7 +962,6 @@ func (ln *localNetwork) restartNode(
 		if err := ln.removeNode(ctx, nodeName); err != nil {
 			return err
 		}
-		syscall.Sync()
 	}
 
 	if _, err := ln.addNode(nodeConfig); err != nil {

local/snapshot.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"syscall"
 
 	"github.com/ava-labs/avalanche-network-runner/api"
 	"github.com/ava-labs/avalanche-network-runner/network"
@@ -156,7 +155,6 @@ func (ln *localNetwork) SaveSnapshot(ctx context.Context, snapshotName string) (
 	if err := ln.stop(ctx); err != nil {
 		return "", err
 	}
-	syscall.Sync()
 	// create main snapshot dirs
 	snapshotDBDir := filepath.Join(snapshotDir, defaultDBSubdir)
 	if err := os.MkdirAll(snapshotDBDir, os.ModePerm); err != nil {

server/server.go

@@ -275,11 +275,13 @@ func (s *server) Start(_ context.Context, req *rpcpb.StartRequest) (*rpcpb.Start
 		return nil, ErrNotEnoughNodesForStart
 	}
 
-	if err := utils.CheckExecPath(req.GetExecPath()); err != nil {
+	execPath := applyDefaultExecPath(req.GetExecPath())
+	pluginDir := applyDefaultPluginDir(req.GetPluginDir())
+
+	if err := utils.CheckExecPath(execPath); err != nil {
 		return nil, err
 	}
 
-	pluginDir := req.GetPluginDir()
 	chainSpecs := []network.BlockchainSpec{}
 	if len(req.GetBlockchainSpecs()) > 0 {
 		s.log.Info("plugin-dir:", zap.String("plugin-dir", pluginDir))
@@ -293,7 +295,6 @@ func (s *server) Start(_ context.Context, req *rpcpb.StartRequest) (*rpcpb.Start
 	}
 
 	var (
-		execPath          = req.GetExecPath()
 		numNodes          = req.GetNumNodes()
 		trackSubnets      = req.GetWhitelistedSubnets()
 		rootDataDir       = req.GetRootDataDir()
@@ -1007,14 +1008,15 @@ func (s *server) AddNode(_ context.Context, req *rpcpb.AddNodeRequest) (*rpcpb.A
 		}
 	}
 
-	if req.GetPluginDir() != "" {
-		nodeFlags[config.PluginDirKey] = req.GetPluginDir()
+	pluginDir := applyDefaultPluginDir(req.GetPluginDir())
+	if pluginDir != "" {
+		nodeFlags[config.PluginDirKey] = pluginDir
 	}
 
 	nodeConfig := node.Config{
 		Name:               req.Name,
 		Flags:              nodeFlags,
-		BinaryPath:         req.GetExecPath(),
+		BinaryPath:         applyDefaultExecPath(req.GetExecPath()),
 		RedirectStdout:     s.cfg.RedirectNodesOutput,
 		RedirectStderr:     s.cfg.RedirectNodesOutput,
 		ChainConfigFiles:   req.ChainConfigs,
@@ -1083,8 +1085,8 @@ func (s *server) RestartNode(ctx context.Context, req *rpcpb.RestartNodeRequest)
 	if err := s.network.nw.RestartNode(
 		ctx,
 		req.Name,
-		req.GetExecPath(),
-		req.GetPluginDir(),
+		applyDefaultExecPath(req.GetExecPath()),
+		applyDefaultPluginDir(req.GetPluginDir()),
 		req.GetWhitelistedSubnets(),
 		req.GetChainConfigs(),
 		req.GetUpgradeConfigs(),
@@ -1281,8 +1283,8 @@ func (s *server) LoadSnapshot(_ context.Context, req *rpcpb.LoadSnapshotRequest)
 	s.log.Info("starting", zap.Int32("pid", pid), zap.String("root-data-dir", rootDataDir))
 
 	s.network, err = newLocalNetwork(localNetworkOptions{
-		execPath:            req.GetExecPath(),
-		pluginDir:           req.GetPluginDir(),
+		execPath:            applyDefaultExecPath(req.GetExecPath()),
+		pluginDir:           applyDefaultPluginDir(req.GetPluginDir()),
 		rootDataDir:         rootDataDir,
 		chainConfigs:        req.ChainConfigs,
 		upgradeConfigs:      req.UpgradeConfigs,
@@ -1663,3 +1665,23 @@ func readFileOrString(conf string) []byte {
 	}
 	return confBytes
 }
+
+// if [userGivenExecPath] is non empty, returns it
+// otherwise if env var utils.DefaultExecPathEnvVar is
+// defined, returns its contents
+func applyDefaultExecPath(userGivenExecPath string) string {
+	if userGivenExecPath != "" {
+		return userGivenExecPath
+	}
+	return os.Getenv(constants.DefaultExecPathEnvVar)
+}
+
+// if [userGivenPluginDir] is non empty, returns it
+// otherwise if env var utils.DefaultPluginDirEnvVar is
+// defined, returns its contents
+func applyDefaultPluginDir(userGivenPluginDir string) string {
+	if userGivenPluginDir != "" {
+		return userGivenPluginDir
+	}
+	return os.Getenv(constants.DefaultPluginDirEnvVar)
+}

tests/e2e/e2e_test.go

@@ -498,11 +498,11 @@ var _ = ginkgo.Describe("[Start/Remove/Restart/Add/Stop]", func() {
 	})
 
 	ginkgo.It("can start", func() {
-		ginkgo.By("start request with invalid exec path should fail", func() {
+		ginkgo.By("start request with empty exec path should fail", func() {
 			ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
 			_, err := cli.Start(ctx, "")
 			cancel()
-			gomega.Ω(err.Error()).Should(gomega.ContainSubstring(utils.ErrInvalidExecPath.Error()))
+			gomega.Ω(err.Error()).Should(gomega.ContainSubstring(utils.ErrEmptyExecPath.Error()))
 		})
 
 		ginkgo.By("start request with invalid exec path should fail", func() {

utils/constants/constants.go

@@ -5,10 +5,12 @@ package constants
 import "path/filepath"
 
 const (
-	LogNameMain    = "main"
-	LogNameControl = "control"
-	LogNameTest    = "test"
-	RootDirPrefix  = "network-runner-root-data"
+	LogNameMain            = "main"
+	LogNameControl         = "control"
+	LogNameTest            = "test"
+	RootDirPrefix          = "network-runner-root-data"
+	DefaultExecPathEnvVar  = "AVALANCHEGO_EXEC_PATH"
+	DefaultPluginDirEnvVar = "AVALANCHEGO_PLUGIN_PATH"
 )
 
 var (

utils/utils.go

@@ -47,14 +47,14 @@ func NetworkIDFromGenesis(genesis []byte) (uint32, error) {
 }
 
 var (
-	ErrInvalidExecPath = errors.New("avalanche exec is invalid")
+	ErrEmptyExecPath   = errors.New("avalanche exec is not defined")
 	ErrNotExists       = errors.New("avalanche exec not exists")
 	ErrNotExistsPlugin = errors.New("plugin exec not exists")
 )
 
 func CheckExecPath(exec string) error {
 	if exec == "" {
-		return ErrInvalidExecPath
+		return ErrEmptyExecPath
 	}
 	_, err := os.Stat(exec)
 	if err != nil {

utils/utils_test.go

@@ -71,7 +71,7 @@ func TestCheckExecPath(t *testing.T) {
 		},
 		{
 			execPath:    "",
-			expectedErr: ErrInvalidExecPath,
+			expectedErr: ErrEmptyExecPath,
 		},
 		{
 			execPath:    "invalid",