Merge pull request #5386 from oasisprotocol/kostko/feature/upgrade-fixes

Various minor upgrade-related fixes
oasisprotocol · Oct 7, 2023 · 553e006 · 553e006
2 parents ab83d43 + f85d47c
commit 553e006
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/.changelog/5386.trivial.md b/.changelog/5386.trivial.md
diff --git a/go/oasis-node/cmd/genesis/migrate.go b/go/oasis-node/cmd/genesis/migrate.go
@@ -364,6 +364,9 @@ NodeLoop:
 		}
 	}
 
+	// Reduce maximum consensus layer block size.
+	newDoc.Consensus.Parameters.MaxBlockSize = 1_048_576 // 1 MiB
+
 	return &newDoc, nil
 }
 

diff --git a/go/oasis-test-runner/scenario/e2e/runtime/helpers_runtime.go b/go/oasis-test-runner/scenario/e2e/runtime/helpers_runtime.go
@@ -178,7 +178,8 @@ func (sc *Scenario) EnsureActiveVersionForComputeWorker(ctx context.Context, nod
 			return fmt.Errorf("%s: unexpected active version (expected: %s got: %s)", node.Name, v, cs.ActiveVersion)
 		}
 		if cs.Status != commonWorker.StatusStateReady {
-			return fmt.Errorf("%s: runtime is not ready (got: %s)", node.Name, cs.Status)
+			time.Sleep(1 * time.Second)
+			continue
 		}
 		break
 	}

diff --git a/go/worker/common/committee/node.go b/go/worker/common/committee/node.go
@@ -613,6 +613,8 @@ func (n *Node) handleNewEventLocked(ev *roothash.Event) {
 
 // Guarded by n.CrossNode.
 func (n *Node) handleRuntimeHostEventLocked(ev *host.Event) {
+	n.logger.Debug("got runtime event", "ev", ev)
+
 	switch {
 	case ev.Started != nil:
 		atomic.StoreUint32(&n.hostedRuntimeProvisioned, 1)