implemented in place for snapshots

Author: felipemadero

client/client.go

@@ -53,7 +53,7 @@ type Client interface {
 	SendOutboundMessage(ctx context.Context, nodeName string, peerID string, op uint32, msgBody []byte) (*rpcpb.SendOutboundMessageResponse, error)
 	Close() error
 	SaveSnapshot(ctx context.Context, snapshotName string, force bool) (*rpcpb.SaveSnapshotResponse, error)
-	LoadSnapshot(ctx context.Context, snapshotName string, opts ...OpOption) (*rpcpb.LoadSnapshotResponse, error)
+	LoadSnapshot(ctx context.Context, snapshotName string, inPlace bool, opts ...OpOption) (*rpcpb.LoadSnapshotResponse, error)
 	RemoveSnapshot(ctx context.Context, snapshotName string) (*rpcpb.RemoveSnapshotResponse, error)
 	ListSnapshots(ctx context.Context) ([]string, error)
 	ListSubnets(ctx context.Context) ([]string, error)
@@ -367,7 +367,7 @@ func (c *client) SaveSnapshot(ctx context.Context, snapshotName string, force bo
 	return c.controlc.SaveSnapshot(ctx, &rpcpb.SaveSnapshotRequest{SnapshotName: snapshotName, Force: force})
 }
 
-func (c *client) LoadSnapshot(ctx context.Context, snapshotName string, opts ...OpOption) (*rpcpb.LoadSnapshotResponse, error) {
+func (c *client) LoadSnapshot(ctx context.Context, snapshotName string, inPlace bool, opts ...OpOption) (*rpcpb.LoadSnapshotResponse, error) {
 	c.log.Info("load snapshot", zap.String("snapshot-name", snapshotName))
 	ret := &Op{}
 	ret.applyOpts(opts)
@@ -376,6 +376,7 @@ func (c *client) LoadSnapshot(ctx context.Context, snapshotName string, opts ...
 		ChainConfigs:   ret.chainConfigs,
 		UpgradeConfigs: ret.upgradeConfigs,
 		SubnetConfigs:  ret.subnetConfigs,
+		InPlace:        inPlace,
 	}
 	if ret.execPath != "" {
 		req.ExecPath = &ret.execPath

cmd/control/control.go

@@ -106,6 +106,7 @@ var (
 	dynamicPorts        bool
 	networkID           uint32
 	force               bool
+	inPlace             bool
 )
 
 func setLogs() error {
@@ -1281,6 +1282,12 @@ func newLoadSnapshotCommand() *cobra.Command {
 		false,
 		"true to reassign snapshot ports if already taken",
 	)
+	cmd.PersistentFlags().BoolVar(
+		&inPlace,
+		"in-place",
+		false,
+		"load snapshot in place, so as it always auto save",
+	)
 	return cmd
 }
 
@@ -1333,7 +1340,7 @@ func loadSnapshotFunc(_ *cobra.Command, args []string) error {
 
 	ctx := getAsyncContext()
 
-	resp, err := cli.LoadSnapshot(ctx, args[0], opts...)
+	resp, err := cli.LoadSnapshot(ctx, args[0], inPlace, opts...)
 	if err != nil {
 		return err
 	}

local/network.go

@@ -566,6 +566,18 @@ func (ln *localNetwork) addNode(nodeConfig node.Config) (node.Node, error) {
 		return nil, fmt.Errorf("couldn't get node ID: %w", err)
 	}
 
+	// If this node is a beacon, add its IP/ID to the beacon lists.
+	// Note that we do this *after* we set this node's bootstrap IPs/IDs
+	// so this node won't try to use itself as a beacon.
+	if !isPausedNode && nodeConfig.IsBeacon {
+		if err := ln.bootstraps.Add(beacon.New(nodeID, ips.IPPort{
+			IP:   net.ParseIP(nodeData.publicIP),
+			Port: nodeData.p2pPort,
+		})); err != nil {
+			return nil, err
+		}
+	}
+
 	// Start the AvalancheGo node and pass it the flags defined above
 	nodeProcess, err := ln.nodeProcessCreator.NewNodeProcess(nodeConfig, nodeData.args...)
 	if err != nil {
@@ -611,15 +623,6 @@ func (ln *localNetwork) addNode(nodeConfig node.Config) (node.Node, error) {
 		attachedPeers: map[string]peer.Peer{},
 	}
 	ln.nodes[node.name] = node
-	// If this node is a beacon, add its IP/ID to the beacon lists.
-	// Note that we do this *after* we set this node's bootstrap IPs/IDs
-	// so this node won't try to use itself as a beacon.
-	if !isPausedNode && nodeConfig.IsBeacon {
-		err = ln.bootstraps.Add(beacon.New(nodeID, ips.IPPort{
-			IP:   net.ParseIP(nodeData.publicIP),
-			Port: nodeData.p2pPort,
-		}))
-	}
 	return node, ln.persistNetwork()
 }
 

local/snapshot.go

@@ -73,6 +73,7 @@ func NewNetworkFromSnapshot(
 	reassignPortsIfUsed bool,
 	redirectStdout bool,
 	redirectStderr bool,
+	inPlace bool,
 ) (network.Network, error) {
 	net, err := newNetwork(
 		log,
@@ -101,6 +102,7 @@ func NewNetworkFromSnapshot(
 		upgradeConfigs,
 		subnetConfigs,
 		flags,
+		inPlace,
 	)
 	return net, err
 }
@@ -189,6 +191,10 @@ func (ln *localNetwork) SaveSnapshot(ctx context.Context, snapshotName string, f
 	if _, err := os.Stat(snapshotDir); err == nil {
 		exists = true
 	}
+	// check is network was loaded in place from the given snapshot
+	if ln.rootDir == snapshotDir {
+		return "", fmt.Errorf("already auto saving into the specified snapshot %q", snapshotName)
+	}
 	if !force && exists {
 		return "", fmt.Errorf("snapshot %q already exists", snapshotName)
 	}
@@ -201,7 +207,9 @@ func (ln *localNetwork) SaveSnapshot(ctx context.Context, snapshotName string, f
 	}
 	// remove if force save
 	if force && exists {
-		ln.RemoveSnapshot(snapshotName)
+		if err := ln.RemoveSnapshot(snapshotName); err != nil {
+			return "", err
+		}
 	}
 	// copy all info
 	if err := dircopy.Copy(ln.rootDir, snapshotDir); err != nil {
@@ -220,6 +228,7 @@ func (ln *localNetwork) loadSnapshot(
 	upgradeConfigs map[string]string,
 	subnetConfigs map[string]string,
 	flags map[string]interface{},
+	inPlace bool,
 ) error {
 	ln.lock.Lock()
 	defer ln.lock.Unlock()
@@ -278,18 +287,19 @@ func (ln *localNetwork) loadSnapshot(
 		}
 	}
 	// load snapshot dir
-	if err := dircopy.Copy(snapshotDir, ln.rootDir); err != nil {
-		return fmt.Errorf("failure loading snapshot root dir: %w", err)
+	if !inPlace {
+		if err := dircopy.Copy(snapshotDir, ln.rootDir); err != nil {
+			return fmt.Errorf("failure loading snapshot root dir: %w", err)
+		}
+	} else {
+		for _, nodeConfig := range networkConfig.NodeConfigs {
+			// logs will be stored outside of the snapshot dir
+			nodeConfig.Flags[config.LogsDirKey] = filepath.Join(ln.rootDir, nodeConfig.Name, "logs")
+		}
+		ln.rootDir = snapshotDir
 	}
 	// configure each node data dir
 	for _, nodeConfig := range networkConfig.NodeConfigs {
-		/*
-			sourceDataDir := filepath.Join(snapshotDir, nodeConfig.Name)
-			targetDataDir := filepath.Join(ln.rootDir, nodeConfig.Name)
-			if err := dircopy.Copy(sourceDataDir, targetDataDir); err != nil {
-				return fmt.Errorf("failure loading node %q data dir: %w", nodeConfig.Name, err)
-			}
-		*/
 		nodeConfig.Flags[config.DataDirKey] = filepath.Join(ln.rootDir, nodeConfig.Name)
 	}
 	// replace binary path