change scheduling

risingwavelabs · Jul 15, 2024 · c7ff25f · c7ff25f
1 parent 90bf313
commit c7ff25f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/proto/catalog.proto b/proto/catalog.proto
@@ -408,7 +408,7 @@ message Table {
 
   // If a materialize view, sink, or table has a node_label, its actors can only be scheduled 
   // on compute nodes with that label.
-  // If a it does not have a node_label it can be scheduled on any 
+  // If a it does not have a node_label (empty map or null value) it can be scheduled on any 
   // Compute node without a label. The node has to have both a matching key and value.
   // E.g. {"some":"value"} can be scheduled on a node with the labels
   // { 
@@ -417,8 +417,9 @@ message Table {
   // }
   // but {"some":"thing"} can not be scheduled on that node.
   // A materialized view or sink or table with an empty node_labels map can only be scheduled on nodes with 
-  // empty node_labels map, but a node with empty node_labels can host anything.
-  map<string, string> node_labels = 101;
+  // empty/null node_labels map. 
+  // A node with an empty/null node_labels map can only host streaming jobs with an empty node_labels map. 
+  optional map<string, string> node_labels = 101;
 }
 
 enum HandleConflictBehavior {

diff --git a/proto/common.proto b/proto/common.proto
@@ -79,16 +79,16 @@ message WorkerNode {
   // Meta may assign labels to worker nodes to partition workload by label.
   // This is used for serverless backfilling of materialized views.
   // If a WorkerNode has labels set it indicates that this node only accepts certain work.
-  // If a WorkerNode has no labels set it indicates that this node accepts any work.
+  // If a WorkerNode has no labels (empty map or null value) the node accepts any work.
   // The materialized view has to have both a matching key and value to be scheduled on a node.
   // E.g. {"some":"value"} can be scheduled on a node with the labels
   // { 
   //   "other":"thing",
   //   "some":"value"
   // }
   // but {"some":"thing"} can not be scheduled on that node.
-  // Worker nodes with an empty node_labels map can host any materialized view or sink or table.
-  map<string, string> node_labels = 10;
+  // Worker nodes with an empty or null node_labels map MVs with an empty or null node_label map.
+  optional map<string, string> node_labels = 10;
 }
 
 message Buffer {