Merge pull request #12 from qu0b/improve/logging

Improve logging
ethpandaops · Feb 29, 2024 · bbfb4b5 · bbfb4b5
2 parents 6444253 + d1c64b2
commit bbfb4b5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/pkg/coordinator/clients/consensus/rpc/eventstream/eventstream.go b/pkg/coordinator/clients/consensus/rpc/eventstream/eventstream.go
@@ -188,10 +188,9 @@ func (stream *Stream) receiveEvents(r io.ReadCloser) {
 			return
 		}
 
-		stream.closeMutex.Unlock()
-
 		pub, ok := ev.(StreamEvent)
 		if !ok {
+			stream.closeMutex.Unlock()
 			continue
 		}
 
@@ -204,6 +203,7 @@ func (stream *Stream) receiveEvents(r io.ReadCloser) {
 		}
 
 		stream.Events <- pub
+		stream.closeMutex.Unlock()
 	}
 }
 

diff --git a/pkg/coordinator/tasks/check_consensus_forks/task.go b/pkg/coordinator/tasks/check_consensus_forks/task.go
@@ -116,7 +116,12 @@ func (t *Task) runCheck() types.TaskResult {
 		t.logger.Warnf("check failed: too many forks. (have: %v, want <= %v)", len(headForks)-1, t.config.MaxForkCount)
 
 		for idx, fork := range headForks {
-			t.logger.Infof("Fork #%v: %v [0x%x] (%v clients)", idx, fork.Slot, fork.Root, len(fork.AllClients))
+			clients := make([]string, len(fork.AllClients))
+			for _, client := range fork.AllClients {
+				clients = append(clients, client.GetName())
+			}
+
+			t.logger.Infof("Fork #%v: %v [0x%x] (%v clients: [%v])", idx, fork.Slot, fork.Root, len(fork.AllClients), clients)
 		}
 
 		return types.TaskResultFailure

diff --git a/pkg/coordinator/test/descriptor.go b/pkg/coordinator/test/descriptor.go
@@ -54,6 +54,10 @@ func LoadTestDescriptors(ctx context.Context, localTests []*types.TestConfig, ex
 
 		testConfig, err := LoadExternalTestConfig(ctx, extTestCfg)
 
+		if testConfig.ID != "" {
+			testID = testConfig.ID
+		}
+
 		if testID == "" {
 			testID = fmt.Sprintf("external-%v", testIdx)
 		}

diff --git a/pkg/coordinator/test/test.go b/pkg/coordinator/test/test.go
@@ -27,7 +27,7 @@ type Test struct {
 func CreateTest(runID uint64, descriptor types.TestDescriptor, logger logrus.FieldLogger, services types.TaskServices, variables types.Variables) (types.Test, error) {
 	test := &Test{
 		runID:      runID,
-		logger:     logger.WithField("RunID", runID),
+		logger:     logger.WithField("RunID", runID).WithField("TestID", descriptor.ID()),
 		descriptor: descriptor,
 		config:     descriptor.Config(),
 		status:     types.TestStatusPending,
@@ -167,6 +167,7 @@ func (t *Test) Run(ctx context.Context) error {
 }
 
 func (t *Test) AbortTest(skipCleanup bool) {
+	t.logger.Info("aborting test")
 	t.status = types.TestStatusAborted
 
 	if t.taskScheduler != nil {