Merge pull request #404 from ava-labs/rework-stacktrace

Rework stacktrace

Author: StephenButtolph

.ci/run_e2e_tests.sh

@@ -7,7 +7,7 @@ AVALANCHE_IMAGE=$(docker image ls --format="{{.Repository}}" | head -n 1)
 DOCKER_REPO="avaplatform"
 
 E2E_TESTING_REMOTE="https://github.com/ava-labs/avalanche-testing.git"
-E2E_TAG="v0.9.2-dev"
+E2E_TAG="v0.9.3-dev.1"
 
 mkdir -p "$E2E_TEST_HOME"
 git clone "$E2E_TESTING_REMOTE" "$E2E_TEST_HOME"

api/admin/service.go

@@ -5,6 +5,7 @@ package admin
 
 import (
 	"errors"
+	"io/ioutil"
 	"net/http"
 
 	"github.com/gorilla/rpc/v2"
@@ -19,6 +20,9 @@ import (
 
 const (
 	maxAliasLength = 512
+
+	// Name of file that stacktraces are written to
+	stacktraceFile = "stacktrace.txt"
 )
 
 var (
@@ -124,15 +128,11 @@ func (service *Admin) AliasChain(_ *http.Request, args *AliasChainArgs, reply *a
 	return service.httpServer.AddAliasesWithReadLock("bc/"+chainID.String(), "bc/"+args.Alias)
 }
 
-// StacktraceReply are the results from calling Stacktrace
-type StacktraceReply struct {
-	Stacktrace string `json:"stacktrace"`
-}
-
 // Stacktrace returns the current global stacktrace
-func (service *Admin) Stacktrace(_ *http.Request, _ *struct{}, reply *StacktraceReply) error {
+func (service *Admin) Stacktrace(_ *http.Request, _ *struct{}, reply *api.SuccessResponse) error {
 	service.log.Info("Admin: Stacktrace called")
 
-	reply.Stacktrace = logging.Stacktrace{Global: true}.String()
-	return nil
+	reply.Success = true
+	stacktrace := []byte(logging.Stacktrace{Global: true}.String())
+	return ioutil.WriteFile(stacktraceFile, stacktrace, 0644)
 }

network/network.go

@@ -949,6 +949,8 @@ func (n *network) upgrade(p *peer, upgrader Upgrader) error {
 	return nil
 }
 
+// assumes the stateLock is not held. Returns an error if the peer couldn't be
+// added.
 func (n *network) tryAddPeer(p *peer) error {
 	key := p.id.Key()
 

node/node.go

@@ -64,7 +64,7 @@ var (
 	genesisHashKey = []byte("genesisID")
 
 	// Version is the version of this code
-	Version       = version.NewDefaultVersion(constants.PlatformName, 0, 8, 2)
+	Version       = version.NewDefaultVersion(constants.PlatformName, 0, 8, 3)
 	versionParser = version.NewDefaultParser()
 )