go scheduler: merge and storage eligibility by runtime

oasisprotocol · Jan 8, 2020 · b4e733f · b4e733f
1 parent b792882
commit b4e733f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/go/consensus/tendermint/apps/scheduler/scheduler.go b/go/consensus/tendermint/apps/scheduler/scheduler.go
@@ -376,7 +376,16 @@ func (app *schedulerApplication) isSuitableComputeWorker(n *node.Node, rt *regis
 }
 
 func (app *schedulerApplication) isSuitableStorageWorker(n *node.Node, rt *registry.Runtime, ts time.Time) bool {
-	return n.HasRoles(node.RoleStorageWorker)
+	if !n.HasRoles(node.RoleStorageWorker) {
+		return false
+	}
+	for _, nrt := range n.Runtimes {
+		if !nrt.ID.Equal(&rt.ID) {
+			continue
+		}
+		return true
+	}
+	return false
 }
 
 func (app *schedulerApplication) isSuitableTransactionScheduler(n *node.Node, rt *registry.Runtime, ts time.Time) bool {
@@ -393,7 +402,16 @@ func (app *schedulerApplication) isSuitableTransactionScheduler(n *node.Node, rt
 }
 
 func (app *schedulerApplication) isSuitableMergeWorker(n *node.Node, rt *registry.Runtime, ts time.Time) bool {
-	return n.HasRoles(node.RoleComputeWorker)
+	if !n.HasRoles(node.RoleComputeWorker) {
+		return false
+	}
+	for _, nrt := range n.Runtimes {
+		if !nrt.ID.Equal(&rt.ID) {
+			continue
+		}
+		return true
+	}
+	return false
 }
 
 // Operates on consensus connection.

diff --git a/go/registry/api/api.go b/go/registry/api/api.go
@@ -143,6 +143,7 @@ var (
 
 	// RuntimesRequiredRoles are the Node roles that require runtimes.
 	RuntimesRequiredRoles = node.RoleComputeWorker |
+		node.RoleStorageWorker |
 		node.RoleKeyManager
 
 	// ConsensusAddressRequiredRoles are the Node roles that require Consensus Address.
@@ -1145,15 +1146,15 @@ func SanityCheckNodes(nodes []*node.SignedNode, seenEntities map[signature.Publi
 			return fmt.Errorf("registry: sanity check failed: compute worker node must have runtime(s)")
 		}
 
-		if n.HasRoles(node.RoleKeyManager) && len(n.Runtimes) == 0 {
-			return fmt.Errorf("registry: sanity check failed: key manager node must have runtime(s)")
+		if n.HasRoles(node.RoleStorageWorker) && len(n.Runtimes) == 0 {
+			return fmt.Errorf("registry: sanity check failed: storage worker node must have runtime(s)")
 		}
 
-		if n.HasRoles(node.RoleStorageWorker) && !n.HasRoles(node.RoleComputeWorker) && !n.HasRoles(node.RoleKeyManager) && len(n.Runtimes) > 0 {
-			return fmt.Errorf("registry: sanity check failed: storage worker node shouldn't have any runtimes")
+		if n.HasRoles(node.RoleKeyManager) && len(n.Runtimes) == 0 {
+			return fmt.Errorf("registry: sanity check failed: key manager node must have runtime(s)")
 		}
 
-		if n.HasRoles(node.RoleValidator) && !n.HasRoles(node.RoleComputeWorker) && !n.HasRoles(node.RoleKeyManager) && len(n.Runtimes) > 0 {
+		if n.HasRoles(node.RoleValidator) && !n.HasRoles(node.RoleComputeWorker) && !n.HasRoles(node.RoleStorageWorker) && !n.HasRoles(node.RoleKeyManager) && len(n.Runtimes) > 0 {
 			return fmt.Errorf("registry: sanity check failed: validator node shouldn't have any runtimes")
 		}