Merge pull request #9080 from tamird/revert-streaming-snapshots

Revert streaming snapshots
cockroachdb · Sep 6, 2016 · d63b41e · d63b41e
2 parents 51c0ea8 + d985d23
commit d63b41e
Show file tree

Hide file tree

Showing 18 changed files with 656 additions and 1,526 deletions.
diff --git a/roachpb/api.pb.go b/roachpb/api.pb.go
diff --git a/roachpb/internal_raft.pb.go b/roachpb/internal_raft.pb.go
diff --git a/roachpb/internal_raft.proto b/roachpb/internal_raft.proto
@@ -57,3 +57,9 @@ message RaftSnapshotData {
   // roundtripping through memory.
   repeated bytes log_entries = 3;
 }
+
+// PartialRaftSnapshotData is used to avoid unmarshaling the entire raftpb.Snapshot
+// twice, as only the RangeDescriptor is required the first time it is unmarshaled.
+message PartialRaftSnapshotData {
+    optional RangeDescriptor range_descriptor = 1 [(gogoproto.nullable) = false];
+}
diff --git a/rpc/context.go b/rpc/context.go
@@ -48,11 +48,7 @@ const (
 // service.
 func NewServer(ctx *Context) *grpc.Server {
 	opts := []grpc.ServerOption{
-		// The limiting factor for lowering the max message size is the fact
-		// that a single large kv can be sent over the network in one message.
-		// Our maximum kv size is unlimited, so we need this to be very large.
-		// TODO(peter,tamird): need tests before lowering
-		grpc.MaxMsgSize(math.MaxInt32),
+		grpc.MaxMsgSize(math.MaxInt32), // TODO(peter,tamird): need tests before lowering
 	}
 	if !ctx.Insecure {
 		tlsConfig, err := ctx.GetServerTLSConfig()

diff --git a/storage/api.pb.go b/storage/api.pb.go