Skip to content

make URI,StakingAddress to be empty when reading a tmpnet after a kill -9 of the processes #2741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felipemadero merged 2 commits into from
Apr 16, 2025
Merged

make URI,StakingAddress to be empty when reading a tmpnet after a kill -9 of the processes #2741

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95d7f4d
make URI,StakingAddress to be empty after kill -9 of tmpnet
felipemadero Apr 15, 2025
3973e66
Merge branch 'main' into fix-tmpnet-process-check
felipemadero Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion pkg/localnet/tmpnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package localnet
import (
"context"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"net/netip"
Expand All @@ -20,6 +21,7 @@ import (
"github.com/ava-labs/avalanchego/api/admin"
"github.com/ava-labs/avalanchego/api/info"
"github.com/ava-labs/avalanchego/config"
"github.com/ava-labs/avalanchego/config/node"
"github.com/ava-labs/avalanchego/genesis"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
Expand Down Expand Up @@ -153,6 +155,28 @@ func GetTmpNetNetwork(networkDir string) (*tmpnet.Network, error) {
if err != nil {
return network, err
}
for i := range network.Nodes {
// ensure that URI and StakingAddress are empty if the process does not exists
processPath := filepath.Join(networkDir, network.Nodes[i].NodeID.String(), "process.json")
if bytes, err := os.ReadFile(processPath); errors.Is(err, os.ErrNotExist) {
network.Nodes[i].URI = ""
network.Nodes[i].StakingAddress = netip.AddrPort{}
} else if err != nil {
return network, fmt.Errorf("failed to read node process context: %w", err)
} else {
processContext := node.ProcessContext{}
if err := json.Unmarshal(bytes, &processContext); err != nil {
return network, fmt.Errorf("failed to unmarshal node process context: %w", err)
}
if _, err := utils.GetProcess(processContext.PID); err != nil {
network.Nodes[i].URI = ""
network.Nodes[i].StakingAddress = netip.AddrPort{}
if err := os.Remove(processPath); err != nil {
return network, fmt.Errorf("failed to clean up node process context: %w", err)
}
}
}
}
networkID, err := GetTmpNetNetworkID(network)
if err != nil {
return network, err
Expand Down Expand Up @@ -194,9 +218,13 @@ func TmpNetLoad(
func TmpNetStop(
networkDir string,
) error {
network, err := GetTmpNetNetwork(networkDir)
if err != nil {
return err
}
ctx, cancel := sdkutils.GetTimedContext(2 * time.Minute)
defer cancel()
return tmpnet.StopNetwork(ctx, networkDir)
return network.Stop(ctx)
}

// Indicates whether the given network has all, part, or none of its nodes running
Expand Down
Loading