mirror of
https://github.com/octoleo/syncthing.git
synced 2024-12-22 02:48:59 +00:00
77970d5113
At a high level, this is what I've done and why: - I'm moving the protobuf generation for the `protocol`, `discovery` and `db` packages to the modern alternatives, and using `buf` to generate because it's nice and simple. - After trying various approaches on how to integrate the new types with the existing code, I opted for splitting off our own data model types from the on-the-wire generated types. This means we can have a `FileInfo` type with nicer ergonomics and lots of methods, while the protobuf generated type stays clean and close to the wire protocol. It does mean copying between the two when required, which certainly adds a small amount of inefficiency. If we want to walk this back in the future and use the raw generated type throughout, that's possible, this however makes the refactor smaller (!) as it doesn't change everything about the type for everyone at the same time. - I have simply removed in cold blood a significant number of old database migrations. These depended on previous generations of generated messages of various kinds and were annoying to support in the new fashion. The oldest supported database version now is the one from Syncthing 1.9.0 from Sep 7, 2020. - I changed config structs to be regular manually defined structs. For the sake of discussion, some things I tried that turned out not to work... ### Embedding / wrapping Embedding the protobuf generated structs in our existing types as a data container and keeping our methods and stuff: ``` package protocol type FileInfo struct { *generated.FileInfo } ``` This generates a lot of problems because the internal shape of the generated struct is quite different (different names, different types, more pointers), because initializing it doesn't work like you'd expect (i.e., you end up with an embedded nil pointer and a panic), and because the types of child types don't get wrapped. That is, even if we also have a similar wrapper around a `Vector`, that's not the type you get when accessing `someFileInfo.Version`, you get the `*generated.Vector` that doesn't have methods, etc. ### Aliasing ``` package protocol type FileInfo = generated.FileInfo ``` Doesn't help because you can't attach methods to it, plus all the above. ### Generating the types into the target package like we do now and attaching methods This fails because of the different shape of the generated type (as in the embedding case above) plus the generated struct already has a bunch of methods that we can't necessarily override properly (like `String()` and a bunch of getters). ### Methods to functions I considered just moving all the methods we attach to functions in a specific package, so that for example ``` package protocol func (f FileInfo) Equal(other FileInfo) bool ``` would become ``` package fileinfos func Equal(a, b *generated.FileInfo) bool ``` and this would mostly work, but becomes quite verbose and cumbersome, and somewhat limits discoverability (you can't see what methods are available on the type in auto completions, etc). In the end I did this in some cases, like in the database layer where a lot of things like `func (fv *FileVersion) IsEmpty() bool` becomes `func fvIsEmpty(fv *generated.FileVersion)` because they were anyway just internal methods. Fixes #8247
201 lines
5.5 KiB
Go
201 lines
5.5 KiB
Go
// Copyright (C) 2016 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package protocol
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"encoding/binary"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/syncthing/syncthing/lib/dialer"
|
|
"github.com/syncthing/syncthing/lib/testutil"
|
|
)
|
|
|
|
func BenchmarkRequestsRawTCP(b *testing.B) {
|
|
// Benchmarks the rate at which we can serve requests over a single,
|
|
// unencrypted TCP channel over the loopback interface.
|
|
|
|
// Get a connected TCP pair
|
|
conn0, conn1, err := getTCPConnectionPair()
|
|
if err != nil {
|
|
b.Fatal(err)
|
|
}
|
|
|
|
defer conn0.Close()
|
|
defer conn1.Close()
|
|
|
|
// Bench it
|
|
benchmarkRequestsConnPair(b, conn0, conn1)
|
|
}
|
|
|
|
func BenchmarkRequestsTLSoTCP(b *testing.B) {
|
|
conn0, conn1, err := getTCPConnectionPair()
|
|
if err != nil {
|
|
b.Fatal(err)
|
|
}
|
|
defer conn0.Close()
|
|
defer conn1.Close()
|
|
benchmarkRequestsTLS(b, conn0, conn1)
|
|
}
|
|
|
|
func benchmarkRequestsTLS(b *testing.B, conn0, conn1 net.Conn) {
|
|
// Benchmarks the rate at which we can serve requests over a single,
|
|
// TLS encrypted channel over the loopback interface.
|
|
|
|
// Load a certificate, skipping this benchmark if it doesn't exist
|
|
cert, err := tls.LoadX509KeyPair("../../test/h1/cert.pem", "../../test/h1/key.pem")
|
|
if err != nil {
|
|
b.Skip(err)
|
|
return
|
|
}
|
|
|
|
/// TLSify them
|
|
conn0, conn1 = negotiateTLS(cert, conn0, conn1)
|
|
|
|
// Bench it
|
|
benchmarkRequestsConnPair(b, conn0, conn1)
|
|
}
|
|
|
|
func benchmarkRequestsConnPair(b *testing.B, conn0, conn1 net.Conn) {
|
|
// Start up Connections on them
|
|
c0 := NewConnection(LocalDeviceID, conn0, conn0, testutil.NoopCloser{}, new(fakeModel), new(mockedConnectionInfo), CompressionMetadata, nil, testKeyGen)
|
|
c0.Start()
|
|
c1 := NewConnection(LocalDeviceID, conn1, conn1, testutil.NoopCloser{}, new(fakeModel), new(mockedConnectionInfo), CompressionMetadata, nil, testKeyGen)
|
|
c1.Start()
|
|
|
|
// Satisfy the assertions in the protocol by sending an initial cluster config
|
|
c0.ClusterConfig(&ClusterConfig{})
|
|
c1.ClusterConfig(&ClusterConfig{})
|
|
|
|
// Report some useful stats and reset the timer for the actual test
|
|
b.ReportAllocs()
|
|
b.SetBytes(128 << 10)
|
|
b.ResetTimer()
|
|
|
|
// Request 128 KiB blocks, which will be satisfied by zero copy from the
|
|
// other side (we'll get back a full block of zeroes).
|
|
var buf []byte
|
|
var err error
|
|
for i := 0; i < b.N; i++ {
|
|
// Use c0 and c1 for each alternating request, so we get as much
|
|
// data flowing in both directions.
|
|
if i%2 == 0 {
|
|
buf, err = c0.Request(context.Background(), &Request{Folder: "folder", Name: "file", BlockNo: i, Offset: int64(i), Size: 128 << 10})
|
|
} else {
|
|
buf, err = c1.Request(context.Background(), &Request{Folder: "folder", Name: "file", BlockNo: i, Offset: int64(i), Size: 128 << 10})
|
|
}
|
|
|
|
if err != nil {
|
|
b.Fatal(err)
|
|
}
|
|
if len(buf) != 128<<10 {
|
|
b.Fatal("Incorrect returned buf length", len(buf), "!=", 128<<10)
|
|
}
|
|
|
|
// The fake model is supposed to tag the end of the buffer with the
|
|
// requested offset, so we can verify that we get back data for this
|
|
// block correctly.
|
|
if binary.BigEndian.Uint64(buf[128<<10-8:]) != uint64(i) {
|
|
b.Fatal("Bad data returned")
|
|
}
|
|
}
|
|
}
|
|
|
|
// returns the two endpoints of a TCP connection over lo0
|
|
func getTCPConnectionPair() (net.Conn, net.Conn, error) {
|
|
lst, err := net.Listen("tcp", "127.0.0.1:0")
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
// We run the Accept in the background since it's blocking, and we use
|
|
// the channel to make the race thingies happy about writing vs reading
|
|
// conn0 and err0.
|
|
var conn0 net.Conn
|
|
var err0 error
|
|
done := make(chan struct{})
|
|
go func() {
|
|
conn0, err0 = lst.Accept()
|
|
close(done)
|
|
}()
|
|
|
|
// Dial the connection
|
|
conn1, err := net.Dial("tcp", lst.Addr().String())
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
// Check any error from accept
|
|
<-done
|
|
if err0 != nil {
|
|
return nil, nil, err0
|
|
}
|
|
|
|
// Set the buffer sizes etc as usual
|
|
dialer.SetTCPOptions(conn0)
|
|
dialer.SetTCPOptions(conn1)
|
|
|
|
return conn0, conn1, nil
|
|
}
|
|
|
|
func negotiateTLS(cert tls.Certificate, conn0, conn1 net.Conn) (net.Conn, net.Conn) {
|
|
cfg := &tls.Config{
|
|
Certificates: []tls.Certificate{cert},
|
|
NextProtos: []string{"bep/1.0"},
|
|
ClientAuth: tls.RequestClientCert,
|
|
SessionTicketsDisabled: true,
|
|
InsecureSkipVerify: true,
|
|
MinVersion: tls.VersionTLS12,
|
|
CipherSuites: []uint16{
|
|
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
|
|
tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
|
|
tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
|
|
},
|
|
}
|
|
|
|
tlsc0 := tls.Server(conn0, cfg)
|
|
tlsc1 := tls.Client(conn1, cfg)
|
|
return tlsc0, tlsc1
|
|
}
|
|
|
|
// The fake model does nothing much
|
|
|
|
type fakeModel struct{}
|
|
|
|
func (*fakeModel) Index(Connection, *Index) error {
|
|
return nil
|
|
}
|
|
|
|
func (*fakeModel) IndexUpdate(Connection, *IndexUpdate) error {
|
|
return nil
|
|
}
|
|
|
|
func (*fakeModel) Request(_ Connection, req *Request) (RequestResponse, error) {
|
|
// We write the offset to the end of the buffer, so the receiver
|
|
// can verify that it did in fact get some data back over the
|
|
// connection.
|
|
buf := make([]byte, req.Size)
|
|
binary.BigEndian.PutUint64(buf[len(buf)-8:], uint64(req.Offset))
|
|
return &fakeRequestResponse{buf}, nil
|
|
}
|
|
|
|
func (*fakeModel) ClusterConfig(Connection, *ClusterConfig) error {
|
|
return nil
|
|
}
|
|
|
|
func (*fakeModel) Closed(Connection, error) {
|
|
}
|
|
|
|
func (*fakeModel) DownloadProgress(Connection, *DownloadProgress) error {
|
|
return nil
|
|
}
|