cmd/stdiscosrv: New discovery server (fixes #4618)
This is a new revision of the discovery server. Relevant changes and
non-changes:
- Protocol towards clients is unchanged.
- Recommended large scale design is still to be deployed nehind nginx (I
tested, and it's still a lot faster at terminating TLS).
- Database backend is leveldb again, only. It scales enough, is easy to
setup, and we don't need any backend to take care of.
- Server supports replication. This is a simple TCP channel - protect it
with a firewall when deploying over the internet. (We deploy this within
the same datacenter, and with firewall.) Any incoming client announces
are sent over the replication channel(s) to other peer discosrvs.
Incoming replication changes are applied to the database as if they came
from clients, but without the TLS/certificate overhead.
- Metrics are exposed using the prometheus library, when enabled.
- The database values and replication protocol is protobuf, because JSON
was quite CPU intensive when I tried that and benchmarked it.
- The "Retry-After" value for failed lookups gets slowly increased from
a default of 120 seconds, by 5 seconds for each failed lookup,
independently by each discosrv. This lowers the query load over time for
clients that are never seen. The Retry-After maxes out at 3600 after a
couple of weeks of this increase. The number of failed lookups is
stored in the database, now and then (avoiding making each lookup a
database put).
All in all this means clients can be pointed towards a cluster using
just multiple A / AAAA records to gain both load sharing and redundancy
(if one is down, clients will talk to the remaining ones).
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4648
2018-01-14 01:52:31 -07:00
|
|
|
// Copyright (C) 2018 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 main
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"os"
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestDatabaseGetSet(t *testing.T) {
|
|
|
|
os.RemoveAll("_database")
|
|
|
|
defer os.RemoveAll("_database")
|
|
|
|
db, err := newLevelDBStore("_database")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
go db.Serve()
|
|
|
|
defer db.Stop()
|
|
|
|
|
|
|
|
// Check missing record
|
|
|
|
|
|
|
|
rec, err := db.get("abcd")
|
|
|
|
if err != nil {
|
|
|
|
t.Error("not found should not be an error")
|
|
|
|
}
|
|
|
|
if len(rec.Addresses) != 0 {
|
|
|
|
t.Error("addresses should be empty")
|
|
|
|
}
|
|
|
|
if rec.Misses != 0 {
|
|
|
|
t.Error("missing should be zero")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set up a clock
|
|
|
|
|
|
|
|
now := time.Now()
|
|
|
|
tc := &testClock{now}
|
|
|
|
db.clock = tc
|
|
|
|
|
|
|
|
// Put a record
|
|
|
|
|
|
|
|
rec.Addresses = []DatabaseAddress{
|
|
|
|
{Address: "tcp://1.2.3.4:5", Expires: tc.Now().Add(time.Minute).UnixNano()},
|
|
|
|
}
|
|
|
|
if err := db.put("abcd", rec); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify it
|
|
|
|
|
|
|
|
rec, err = db.get("abcd")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(rec.Addresses) != 1 {
|
|
|
|
t.Log(rec.Addresses)
|
|
|
|
t.Fatal("should have one address")
|
|
|
|
}
|
|
|
|
if rec.Addresses[0].Address != "tcp://1.2.3.4:5" {
|
|
|
|
t.Log(rec.Addresses)
|
|
|
|
t.Error("incorrect address")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wind the clock one half expiry, and merge in a new address
|
|
|
|
|
|
|
|
tc.wind(30 * time.Second)
|
|
|
|
|
|
|
|
addrs := []DatabaseAddress{
|
|
|
|
{Address: "tcp://6.7.8.9:0", Expires: tc.Now().Add(time.Minute).UnixNano()},
|
|
|
|
}
|
|
|
|
if err := db.merge("abcd", addrs, tc.Now().UnixNano()); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify it
|
|
|
|
|
|
|
|
rec, err = db.get("abcd")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(rec.Addresses) != 2 {
|
|
|
|
t.Log(rec.Addresses)
|
|
|
|
t.Fatal("should have two addresses")
|
|
|
|
}
|
|
|
|
if rec.Addresses[0].Address != "tcp://1.2.3.4:5" {
|
|
|
|
t.Log(rec.Addresses)
|
|
|
|
t.Error("incorrect address[0]")
|
|
|
|
}
|
|
|
|
if rec.Addresses[1].Address != "tcp://6.7.8.9:0" {
|
|
|
|
t.Log(rec.Addresses)
|
|
|
|
t.Error("incorrect address[1]")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Pass the first expiry time
|
|
|
|
|
|
|
|
tc.wind(45 * time.Second)
|
|
|
|
|
|
|
|
// Verify it
|
|
|
|
|
|
|
|
rec, err = db.get("abcd")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(rec.Addresses) != 1 {
|
|
|
|
t.Log(rec.Addresses)
|
|
|
|
t.Fatal("should have one address")
|
|
|
|
}
|
|
|
|
if rec.Addresses[0].Address != "tcp://6.7.8.9:0" {
|
|
|
|
t.Log(rec.Addresses)
|
|
|
|
t.Error("incorrect address")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Put a record with misses
|
|
|
|
|
|
|
|
rec = DatabaseRecord{Misses: 42}
|
|
|
|
if err := db.put("efgh", rec); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify it
|
|
|
|
|
|
|
|
rec, err = db.get("efgh")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(rec.Addresses) != 0 {
|
|
|
|
t.Log(rec.Addresses)
|
|
|
|
t.Fatal("should have no addresses")
|
|
|
|
}
|
|
|
|
if rec.Misses != 42 {
|
|
|
|
t.Log(rec.Misses)
|
|
|
|
t.Error("incorrect misses")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set an address
|
|
|
|
|
|
|
|
addrs = []DatabaseAddress{
|
|
|
|
{Address: "tcp://6.7.8.9:0", Expires: tc.Now().Add(time.Minute).UnixNano()},
|
|
|
|
}
|
|
|
|
if err := db.merge("efgh", addrs, tc.Now().UnixNano()); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify it
|
|
|
|
|
|
|
|
rec, err = db.get("efgh")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if len(rec.Addresses) != 1 {
|
|
|
|
t.Log(rec.Addresses)
|
2018-02-24 00:51:29 -07:00
|
|
|
t.Fatal("should have one address")
|
cmd/stdiscosrv: New discovery server (fixes #4618)
This is a new revision of the discovery server. Relevant changes and
non-changes:
- Protocol towards clients is unchanged.
- Recommended large scale design is still to be deployed nehind nginx (I
tested, and it's still a lot faster at terminating TLS).
- Database backend is leveldb again, only. It scales enough, is easy to
setup, and we don't need any backend to take care of.
- Server supports replication. This is a simple TCP channel - protect it
with a firewall when deploying over the internet. (We deploy this within
the same datacenter, and with firewall.) Any incoming client announces
are sent over the replication channel(s) to other peer discosrvs.
Incoming replication changes are applied to the database as if they came
from clients, but without the TLS/certificate overhead.
- Metrics are exposed using the prometheus library, when enabled.
- The database values and replication protocol is protobuf, because JSON
was quite CPU intensive when I tried that and benchmarked it.
- The "Retry-After" value for failed lookups gets slowly increased from
a default of 120 seconds, by 5 seconds for each failed lookup,
independently by each discosrv. This lowers the query load over time for
clients that are never seen. The Retry-After maxes out at 3600 after a
couple of weeks of this increase. The number of failed lookups is
stored in the database, now and then (avoiding making each lookup a
database put).
All in all this means clients can be pointed towards a cluster using
just multiple A / AAAA records to gain both load sharing and redundancy
(if one is down, clients will talk to the remaining ones).
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4648
2018-01-14 01:52:31 -07:00
|
|
|
}
|
|
|
|
if rec.Misses != 0 {
|
|
|
|
t.Log(rec.Misses)
|
|
|
|
t.Error("should have no misses")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFilter(t *testing.T) {
|
|
|
|
// all cases are expired with t=10
|
|
|
|
cases := []struct {
|
|
|
|
a []DatabaseAddress
|
|
|
|
b []DatabaseAddress
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
a: nil,
|
|
|
|
b: nil,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
a: []DatabaseAddress{{Address: "a", Expires: 9}, {Address: "b", Expires: 9}, {Address: "c", Expires: 9}},
|
|
|
|
b: []DatabaseAddress{},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
a: []DatabaseAddress{{Address: "a", Expires: 10}},
|
|
|
|
b: []DatabaseAddress{{Address: "a", Expires: 10}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
a: []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}},
|
|
|
|
b: []DatabaseAddress{{Address: "a", Expires: 10}, {Address: "b", Expires: 10}, {Address: "c", Expires: 10}},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
a: []DatabaseAddress{{Address: "a", Expires: 5}, {Address: "b", Expires: 15}, {Address: "c", Expires: 5}, {Address: "d", Expires: 15}, {Address: "e", Expires: 5}},
|
|
|
|
b: []DatabaseAddress{{Address: "d", Expires: 15}, {Address: "b", Expires: 15}}, // gets reordered
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range cases {
|
|
|
|
res := expire(tc.a, 10)
|
|
|
|
if fmt.Sprint(res) != fmt.Sprint(tc.b) {
|
|
|
|
t.Errorf("Incorrect result %v, expected %v", res, tc.b)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type testClock struct {
|
|
|
|
now time.Time
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *testClock) wind(d time.Duration) {
|
|
|
|
t.now = t.now.Add(d)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *testClock) Now() time.Time {
|
|
|
|
return t.now
|
|
|
|
}
|