Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: node RPCCall returns nil instead of error #167

Merged
merged 6 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,6 @@ cmd/benchmark/benchmark
ideas.txt

cmd/protoc-gen-gorums/gengorums/template_static.go.bak

# jetbrains IDE files
.idea/
2 changes: 2 additions & 0 deletions .vscode/gorums.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ grpc
Hein
ICDCS
Idxs
Iface
Ingve
installgorums
Jehl
Expand All @@ -50,6 +51,7 @@ protobuf
protoc
protogen
protoimpl
protoreflect
ptypes
QCQF
qcresult
Expand Down
6 changes: 3 additions & 3 deletions rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ type CallData struct {
// RPCCall executes a remote procedure call on the node.
//
// This method should be used by generated code only.
func (n *RawNode) RPCCall(ctx context.Context, d CallData) (resp protoreflect.ProtoMessage, err error) {
func (n *RawNode) RPCCall(ctx context.Context, d CallData) (protoreflect.ProtoMessage, error) {
md := &ordering.Metadata{MessageID: n.mgr.getMsgID(), Method: d.Method}
replyChan := make(chan response, 1)
n.channel.enqueue(request{ctx: ctx, msg: &Message{Metadata: md, Message: d.Message}}, replyChan, false)

select {
case r := <-replyChan:
if r.err != nil {
return nil, err
return nil, r.err
}
return r.msg, nil
case <-ctx.Done():
return resp, ctx.Err()
return nil, ctx.Err()
}
}
121 changes: 121 additions & 0 deletions rpc_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
package gorums_test

import (
"context"
"fmt"
"testing"
"time"

"github.com/relab/gorums"
"github.com/relab/gorums/tests/dummy"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)

func TestRPCCallSuccess(t *testing.T) {
addrs, teardown := gorums.TestSetup(t, 1, func(_ int) gorums.ServerIface {
return initServer()
})
defer teardown()

mgr := rpcTestMgr()

_, err := mgr.NewConfiguration(gorums.WithNodeList(addrs))
if err != nil {
t.Fatal(err)
}

node := mgr.Nodes()[0]
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
response, err := node.RPCCall(ctx, gorums.CallData{
Message: &dummy.Empty{},
Method: "dummy.Dummy.Test",
})
if err != nil {
t.Fatalf("Unexpected error, got: %v, want: %v", err, nil)
}
if response == nil {
t.Fatalf("Unexpected response, got: %v, want: %v", nil, &dummy.Empty{})
}
}

func TestRPCCallDownedNode(t *testing.T) {
addrs, teardown := gorums.TestSetup(t, 1, func(_ int) gorums.ServerIface {
return initServer()
})
mgr := rpcTestMgr()

_, err := mgr.NewConfiguration(gorums.WithNodeList(addrs))
if err != nil {
t.Fatal(err)
}

teardown() // stop all servers on purpose
time.Sleep(300 * time.Millisecond) // servers are not stopped immediately
node := mgr.Nodes()[0]
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
response, err := node.RPCCall(ctx, gorums.CallData{
Message: &dummy.Empty{},
Method: "dummy.Dummy.Test",
})
if err == nil {
t.Fatalf("Unexpected error, got: %v, want: %v", err, fmt.Errorf("rpc error: code = Unavailable desc = stream is down"))
}
if response != nil {
t.Fatalf("Unexpected response, got: %v, want: %v", response, nil)
}
}

func TestRPCCallTimedOut(t *testing.T) {
addrs, teardown := gorums.TestSetup(t, 1, func(_ int) gorums.ServerIface {
return initServer()
})
defer teardown()

mgr := rpcTestMgr()

_, err := mgr.NewConfiguration(gorums.WithNodeList(addrs))
if err != nil {
t.Fatal(err)
}

node := mgr.Nodes()[0]
ctx, cancel := context.WithTimeout(context.Background(), 0*time.Second)
time.Sleep(50 * time.Millisecond)
defer cancel()
response, err := node.RPCCall(ctx, gorums.CallData{
Message: &dummy.Empty{},
Method: "dummy.Dummy.Test",
})
if err == nil {
t.Fatalf("Unexpected error, got: %v, want: %v", err, fmt.Errorf("context deadline exceeded"))
}
if response != nil {
t.Fatalf("Unexpected response, got: %v, want: %v", response, nil)
}
}

func initServer() *gorums.Server {
srv := gorums.NewServer()
dummy.RegisterDummyServer(srv, &testSrv{})
return srv
}

func rpcTestMgr() *dummy.Manager {
mgr := dummy.NewManager(
gorums.WithDialTimeout(time.Second),
gorums.WithGrpcDialOptions(
grpc.WithBlock(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
),
)
return mgr
}

type testSrv struct{}

func (t testSrv) Test(ctx gorums.ServerCtx, request *dummy.Empty) (response *dummy.Empty, err error) {
return &dummy.Empty{}, nil
}
Loading