Merge 84e0554 into 07ceb18

uwescience · Jun 19, 2017 · d391121 · d391121
2 parents 07ceb18 + 84e0554
commit d391121
Show file tree

Hide file tree

Showing 15 changed files with 1,440 additions and 642 deletions.
diff --git a/protobuf/control.proto b/protobuf/control.proto
@@ -17,6 +17,12 @@ message ControlMessage {
   optional SocketInfo remote_address = 3;
   repeated ResourceStats resource_stats = 4;
   repeated int32 acked_worker_ids = 5;
+  optional Exception worker_exception = 6;	// REMOVE_WORKER
+}
+
+message Exception {
+ // for now, the exception is a simple java serialized object.
+ required bytes exception = 1;
 }
 
 message SocketInfo {