dev,plugins: Fix nil values being added to the reply slice

TestPerNodeArg is left failing to demonstrate the issue. See #35.
relab · Sep 28, 2017 · 1ed8bf1 · 1ed8bf1
1 parent 43b6449
commit 1ed8bf1
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 78 deletions.
diff --git a/dev/calltype_common_definitions.tmpl b/dev/calltype_common_definitions.tmpl
@@ -3,11 +3,6 @@
 
 {{define "callGRPC"}}
 func callGRPC{{.MethodName}}(ctx context.Context, node *Node, arg *{{.FQReqName}}, replyChan chan<- {{.UnexportedTypeName}}) {
-	if arg == nil {
-		// send a nil reply to the for-select-loop
-		replyChan <- {{.UnexportedTypeName}}{node.id, nil, nil}
-		return
-	}
 	reply := new({{.FQRespName}})
 	start := time.Now()
 	err := grpc.Invoke(
@@ -87,12 +82,16 @@ func (c *Configuration) {{.UnexportedMethodName}}(ctx context.Context, a *{{.FQR
 {{end}}
 
 {{define "callLoop"}}
-	replyChan := make(chan {{.UnexportedTypeName}}, c.n)
-	for _, n := range c.nodes {
+  expected := c.n
+  replyChan := make(chan {{.UnexportedTypeName}}, expected)
+  for _, n := range c.nodes {
 {{- if .PerNodeArg}}
-		go callGRPC{{.MethodName}}(ctx, n, f(*a, n.id), replyChan)
-{{else}}
-		go callGRPC{{.MethodName}}(ctx, n, a, replyChan)
+    a := f(*a, n.id)
+    if a == nil {
+      expected--
+      continue
+    }
 {{end -}}
-	}
+    go callGRPC{{.MethodName}}(ctx, n, a, replyChan)
+  }
 {{end}}
diff --git a/dev/calltype_correctable_gen.go b/dev/calltype_correctable_gen.go
diff --git a/dev/calltype_correctable_stream_gen.go b/dev/calltype_correctable_stream_gen.go
diff --git a/dev/calltype_future_gen.go b/dev/calltype_future_gen.go
diff --git a/dev/calltype_quorumcall.tmpl b/dev/calltype_quorumcall.tmpl
@@ -55,7 +55,7 @@ func (c *Configuration) {{.UnexportedMethodName}}(ctx context.Context, a *{{.FQR
 	{{template "callLoop" .}}
 
 	var (
-		replyValues = make([]*{{.FQRespName}}, 0, c.n)
+		replyValues = make([]*{{.FQRespName}}, 0, expected)
 		errCount    int
 		quorum      bool
 	)
@@ -82,7 +82,7 @@ func (c *Configuration) {{.UnexportedMethodName}}(ctx context.Context, a *{{.FQR
 			return resp, QuorumCallError{ctx.Err().Error(), errCount, len(replyValues)}
 		}
 
-		if errCount+len(replyValues) == c.n {
+		if errCount+len(replyValues) == expected {
 			return resp, QuorumCallError{"incomplete call", errCount, len(replyValues)}
 		}
 	}

diff --git a/dev/calltype_quorumcall_gen.go b/dev/calltype_quorumcall_gen.go
diff --git a/plugins/gorums/templates.go b/plugins/gorums/templates.go