mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2026-03-14 14:35:44 +01:00
Allow running backend configuration tests in parallel.
This commit is contained in:
Joachim Bauch
parent
b86d05de08
commit
958f50cec3
4 changed files with 158 additions and 89 deletions
|
|
@ -171,10 +171,19 @@ type BackendStorage interface {
|
|||
GetBackends() []*Backend
|
||||
}
|
||||
|
||||
type BackendStorageStats interface {
|
||||
AddBackends(count int)
|
||||
RemoveBackends(count int)
|
||||
IncBackends()
|
||||
DecBackends()
|
||||
}
|
||||
|
||||
type backendStorageCommon struct {
|
||||
mu sync.RWMutex
|
||||
// +checklocks:mu
|
||||
backends map[string][]*Backend
|
||||
|
||||
stats BackendStorageStats // +checklocksignore: Only written to from constructor
|
||||
}
|
||||
|
||||
func (s *backendStorageCommon) GetBackends() []*Backend {
|
||||
|
|
@ -224,21 +233,50 @@ type BackendConfiguration struct {
|
|||
storage BackendStorage
|
||||
}
|
||||
|
||||
type prometheusBackendStats struct{}
|
||||
|
||||
func (s *prometheusBackendStats) AddBackends(count int) {
|
||||
statsBackendsCurrent.Add(float64(count))
|
||||
}
|
||||
|
||||
func (s *prometheusBackendStats) RemoveBackends(count int) {
|
||||
statsBackendsCurrent.Sub(float64(count))
|
||||
}
|
||||
|
||||
func (s *prometheusBackendStats) IncBackends() {
|
||||
statsBackendsCurrent.Inc()
|
||||
}
|
||||
|
||||
func (s *prometheusBackendStats) DecBackends() {
|
||||
statsBackendsCurrent.Dec()
|
||||
}
|
||||
|
||||
var (
|
||||
defaultBackendStats = &prometheusBackendStats{}
|
||||
)
|
||||
|
||||
func NewBackendConfiguration(logger Logger, config *goconf.ConfigFile, etcdClient *EtcdClient) (*BackendConfiguration, error) {
|
||||
return NewBackendConfigurationWithStats(logger, config, etcdClient, nil)
|
||||
}
|
||||
|
||||
func NewBackendConfigurationWithStats(logger Logger, config *goconf.ConfigFile, etcdClient *EtcdClient, stats BackendStorageStats) (*BackendConfiguration, error) {
|
||||
backendType, _ := config.GetString("backend", "backendtype")
|
||||
if backendType == "" {
|
||||
backendType = DefaultBackendType
|
||||
}
|
||||
|
||||
RegisterBackendConfigurationStats()
|
||||
if stats == nil {
|
||||
RegisterBackendConfigurationStats()
|
||||
stats = defaultBackendStats
|
||||
}
|
||||
|
||||
var storage BackendStorage
|
||||
var err error
|
||||
switch backendType {
|
||||
case BackendTypeStatic:
|
||||
storage, err = NewBackendStorageStatic(logger, config)
|
||||
storage, err = NewBackendStorageStatic(logger, config, stats)
|
||||
case BackendTypeEtcd:
|
||||
storage, err = NewBackendStorageEtcd(logger, config, etcdClient)
|
||||
storage, err = NewBackendStorageEtcd(logger, config, etcdClient, stats)
|
||||
default:
|
||||
err = fmt.Errorf("unknown backend type: %s", backendType)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,6 +84,26 @@ func testBackends(t *testing.T, config *BackendConfiguration, valid_urls [][]str
|
|||
}
|
||||
}
|
||||
|
||||
type mockBackendStats struct {
|
||||
value int
|
||||
}
|
||||
|
||||
func (s *mockBackendStats) AddBackends(count int) {
|
||||
s.value += count
|
||||
}
|
||||
|
||||
func (s *mockBackendStats) RemoveBackends(count int) {
|
||||
s.value -= count
|
||||
}
|
||||
|
||||
func (s *mockBackendStats) IncBackends() {
|
||||
s.value++
|
||||
}
|
||||
|
||||
func (s *mockBackendStats) DecBackends() {
|
||||
s.value--
|
||||
}
|
||||
|
||||
func TestIsUrlAllowed_Compat(t *testing.T) {
|
||||
t.Parallel()
|
||||
logger := NewLoggerForTest(t)
|
||||
|
|
@ -233,11 +253,13 @@ func TestParseBackendIds(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestBackendReloadNoChange(t *testing.T) { // nolint:paralleltest
|
||||
ResetStatsValue(t, statsBackendsCurrent)
|
||||
func TestBackendReloadNoChange(t *testing.T) {
|
||||
t.Parallel()
|
||||
stats := &mockBackendStats{}
|
||||
|
||||
logger := NewLoggerForTest(t)
|
||||
require := require.New(t)
|
||||
assert := assert.New(t)
|
||||
original_config := goconf.NewConfigFile()
|
||||
original_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
original_config.AddOption("backend", "allowall", "false")
|
||||
|
|
@ -245,9 +267,9 @@ func TestBackendReloadNoChange(t *testing.T) { // nolint:paralleltest
|
|||
original_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend1")
|
||||
original_config.AddOption("backend2", "url", "http://domain2.invalid")
|
||||
original_config.AddOption("backend2", "secret", string(testBackendSecret)+"-backend2")
|
||||
o_cfg, err := NewBackendConfiguration(logger, original_config, nil)
|
||||
o_cfg, err := NewBackendConfigurationWithStats(logger, original_config, nil, stats)
|
||||
require.NoError(err)
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
|
||||
new_config := goconf.NewConfigFile()
|
||||
new_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
|
|
@ -256,22 +278,24 @@ func TestBackendReloadNoChange(t *testing.T) { // nolint:paralleltest
|
|||
new_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend1")
|
||||
new_config.AddOption("backend2", "url", "http://domain2.invalid")
|
||||
new_config.AddOption("backend2", "secret", string(testBackendSecret)+"-backend2")
|
||||
n_cfg, err := NewBackendConfiguration(logger, new_config, nil)
|
||||
n_cfg, err := NewBackendConfigurationWithStats(logger, new_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 4)
|
||||
assert.Equal(4, stats.value)
|
||||
o_cfg.Reload(original_config)
|
||||
checkStatsValue(t, statsBackendsCurrent, 4)
|
||||
assert.Equal(4, stats.value)
|
||||
if !reflect.DeepEqual(n_cfg, o_cfg) {
|
||||
assert.Fail(t, "BackendConfiguration should be equal after Reload")
|
||||
assert.Fail("BackendConfiguration should be equal after Reload")
|
||||
}
|
||||
}
|
||||
|
||||
func TestBackendReloadChangeExistingURL(t *testing.T) { // nolint:paralleltest
|
||||
ResetStatsValue(t, statsBackendsCurrent)
|
||||
func TestBackendReloadChangeExistingURL(t *testing.T) {
|
||||
t.Parallel()
|
||||
stats := &mockBackendStats{}
|
||||
|
||||
logger := NewLoggerForTest(t)
|
||||
require := require.New(t)
|
||||
assert := assert.New(t)
|
||||
original_config := goconf.NewConfigFile()
|
||||
original_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
original_config.AddOption("backend", "allowall", "false")
|
||||
|
|
@ -279,10 +303,10 @@ func TestBackendReloadChangeExistingURL(t *testing.T) { // nolint:paralleltest
|
|||
original_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend1")
|
||||
original_config.AddOption("backend2", "url", "http://domain2.invalid")
|
||||
original_config.AddOption("backend2", "secret", string(testBackendSecret)+"-backend2")
|
||||
o_cfg, err := NewBackendConfiguration(logger, original_config, nil)
|
||||
o_cfg, err := NewBackendConfigurationWithStats(logger, original_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
new_config := goconf.NewConfigFile()
|
||||
new_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
new_config.AddOption("backend", "allowall", "false")
|
||||
|
|
@ -291,26 +315,28 @@ func TestBackendReloadChangeExistingURL(t *testing.T) { // nolint:paralleltest
|
|||
new_config.AddOption("backend1", "sessionlimit", "10")
|
||||
new_config.AddOption("backend2", "url", "http://domain2.invalid")
|
||||
new_config.AddOption("backend2", "secret", string(testBackendSecret)+"-backend2")
|
||||
n_cfg, err := NewBackendConfiguration(logger, new_config, nil)
|
||||
n_cfg, err := NewBackendConfigurationWithStats(logger, new_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 4)
|
||||
assert.Equal(4, stats.value)
|
||||
original_config.RemoveOption("backend1", "url")
|
||||
original_config.AddOption("backend1", "url", "http://domain3.invalid")
|
||||
original_config.AddOption("backend1", "sessionlimit", "10")
|
||||
|
||||
o_cfg.Reload(original_config)
|
||||
checkStatsValue(t, statsBackendsCurrent, 4)
|
||||
assert.Equal(4, stats.value)
|
||||
if !reflect.DeepEqual(n_cfg, o_cfg) {
|
||||
assert.Fail(t, "BackendConfiguration should be equal after Reload")
|
||||
assert.Fail("BackendConfiguration should be equal after Reload")
|
||||
}
|
||||
}
|
||||
|
||||
func TestBackendReloadChangeSecret(t *testing.T) { // nolint:paralleltest
|
||||
ResetStatsValue(t, statsBackendsCurrent)
|
||||
func TestBackendReloadChangeSecret(t *testing.T) {
|
||||
t.Parallel()
|
||||
stats := &mockBackendStats{}
|
||||
|
||||
logger := NewLoggerForTest(t)
|
||||
require := require.New(t)
|
||||
assert := assert.New(t)
|
||||
original_config := goconf.NewConfigFile()
|
||||
original_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
original_config.AddOption("backend", "allowall", "false")
|
||||
|
|
@ -318,10 +344,10 @@ func TestBackendReloadChangeSecret(t *testing.T) { // nolint:paralleltest
|
|||
original_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend1")
|
||||
original_config.AddOption("backend2", "url", "http://domain2.invalid")
|
||||
original_config.AddOption("backend2", "secret", string(testBackendSecret)+"-backend2")
|
||||
o_cfg, err := NewBackendConfiguration(logger, original_config, nil)
|
||||
o_cfg, err := NewBackendConfigurationWithStats(logger, original_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
new_config := goconf.NewConfigFile()
|
||||
new_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
new_config.AddOption("backend", "allowall", "false")
|
||||
|
|
@ -329,32 +355,34 @@ func TestBackendReloadChangeSecret(t *testing.T) { // nolint:paralleltest
|
|||
new_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend3")
|
||||
new_config.AddOption("backend2", "url", "http://domain2.invalid")
|
||||
new_config.AddOption("backend2", "secret", string(testBackendSecret)+"-backend2")
|
||||
n_cfg, err := NewBackendConfiguration(logger, new_config, nil)
|
||||
n_cfg, err := NewBackendConfigurationWithStats(logger, new_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 4)
|
||||
assert.Equal(4, stats.value)
|
||||
original_config.RemoveOption("backend1", "secret")
|
||||
original_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend3")
|
||||
|
||||
o_cfg.Reload(original_config)
|
||||
checkStatsValue(t, statsBackendsCurrent, 4)
|
||||
assert.Equal(t, n_cfg, o_cfg, "BackendConfiguration should be equal after Reload")
|
||||
assert.Equal(4, stats.value)
|
||||
assert.Equal(n_cfg, o_cfg, "BackendConfiguration should be equal after Reload")
|
||||
}
|
||||
|
||||
func TestBackendReloadAddBackend(t *testing.T) { // nolint:paralleltest
|
||||
ResetStatsValue(t, statsBackendsCurrent)
|
||||
func TestBackendReloadAddBackend(t *testing.T) {
|
||||
t.Parallel()
|
||||
stats := &mockBackendStats{}
|
||||
|
||||
logger := NewLoggerForTest(t)
|
||||
require := require.New(t)
|
||||
assert := assert.New(t)
|
||||
original_config := goconf.NewConfigFile()
|
||||
original_config.AddOption("backend", "backends", "backend1")
|
||||
original_config.AddOption("backend", "allowall", "false")
|
||||
original_config.AddOption("backend1", "url", "http://domain1.invalid")
|
||||
original_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend1")
|
||||
o_cfg, err := NewBackendConfiguration(logger, original_config, nil)
|
||||
o_cfg, err := NewBackendConfigurationWithStats(logger, original_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 1)
|
||||
assert.Equal(1, stats.value)
|
||||
new_config := goconf.NewConfigFile()
|
||||
new_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
new_config.AddOption("backend", "allowall", "false")
|
||||
|
|
@ -363,10 +391,10 @@ func TestBackendReloadAddBackend(t *testing.T) { // nolint:paralleltest
|
|||
new_config.AddOption("backend2", "url", "http://domain2.invalid")
|
||||
new_config.AddOption("backend2", "secret", string(testBackendSecret)+"-backend2")
|
||||
new_config.AddOption("backend2", "sessionlimit", "10")
|
||||
n_cfg, err := NewBackendConfiguration(logger, new_config, nil)
|
||||
n_cfg, err := NewBackendConfigurationWithStats(logger, new_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 3)
|
||||
assert.Equal(3, stats.value)
|
||||
original_config.RemoveOption("backend", "backends")
|
||||
original_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
original_config.AddOption("backend2", "url", "http://domain2.invalid")
|
||||
|
|
@ -374,17 +402,19 @@ func TestBackendReloadAddBackend(t *testing.T) { // nolint:paralleltest
|
|||
original_config.AddOption("backend2", "sessionlimit", "10")
|
||||
|
||||
o_cfg.Reload(original_config)
|
||||
checkStatsValue(t, statsBackendsCurrent, 4)
|
||||
assert.Equal(4, stats.value)
|
||||
if !reflect.DeepEqual(n_cfg, o_cfg) {
|
||||
assert.Fail(t, "BackendConfiguration should be equal after Reload")
|
||||
assert.Fail("BackendConfiguration should be equal after Reload")
|
||||
}
|
||||
}
|
||||
|
||||
func TestBackendReloadRemoveHost(t *testing.T) { // nolint:paralleltest
|
||||
ResetStatsValue(t, statsBackendsCurrent)
|
||||
func TestBackendReloadRemoveHost(t *testing.T) {
|
||||
t.Parallel()
|
||||
stats := &mockBackendStats{}
|
||||
|
||||
logger := NewLoggerForTest(t)
|
||||
require := require.New(t)
|
||||
assert := assert.New(t)
|
||||
original_config := goconf.NewConfigFile()
|
||||
original_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
original_config.AddOption("backend", "allowall", "false")
|
||||
|
|
@ -392,35 +422,37 @@ func TestBackendReloadRemoveHost(t *testing.T) { // nolint:paralleltest
|
|||
original_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend1")
|
||||
original_config.AddOption("backend2", "url", "http://domain2.invalid")
|
||||
original_config.AddOption("backend2", "secret", string(testBackendSecret)+"-backend2")
|
||||
o_cfg, err := NewBackendConfiguration(logger, original_config, nil)
|
||||
o_cfg, err := NewBackendConfigurationWithStats(logger, original_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
new_config := goconf.NewConfigFile()
|
||||
new_config.AddOption("backend", "backends", "backend1")
|
||||
new_config.AddOption("backend", "allowall", "false")
|
||||
new_config.AddOption("backend1", "url", "http://domain1.invalid")
|
||||
new_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend1")
|
||||
n_cfg, err := NewBackendConfiguration(logger, new_config, nil)
|
||||
n_cfg, err := NewBackendConfigurationWithStats(logger, new_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 3)
|
||||
assert.Equal(3, stats.value)
|
||||
original_config.RemoveOption("backend", "backends")
|
||||
original_config.AddOption("backend", "backends", "backend1")
|
||||
original_config.RemoveSection("backend2")
|
||||
|
||||
o_cfg.Reload(original_config)
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
if !reflect.DeepEqual(n_cfg, o_cfg) {
|
||||
assert.Fail(t, "BackendConfiguration should be equal after Reload")
|
||||
assert.Fail("BackendConfiguration should be equal after Reload")
|
||||
}
|
||||
}
|
||||
|
||||
func TestBackendReloadRemoveBackendFromSharedHost(t *testing.T) { // nolint:paralleltest
|
||||
ResetStatsValue(t, statsBackendsCurrent)
|
||||
func TestBackendReloadRemoveBackendFromSharedHost(t *testing.T) {
|
||||
t.Parallel()
|
||||
stats := &mockBackendStats{}
|
||||
|
||||
logger := NewLoggerForTest(t)
|
||||
require := require.New(t)
|
||||
assert := assert.New(t)
|
||||
original_config := goconf.NewConfigFile()
|
||||
original_config.AddOption("backend", "backends", "backend1, backend2")
|
||||
original_config.AddOption("backend", "allowall", "false")
|
||||
|
|
@ -428,27 +460,27 @@ func TestBackendReloadRemoveBackendFromSharedHost(t *testing.T) { // nolint:para
|
|||
original_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend1")
|
||||
original_config.AddOption("backend2", "url", "http://domain1.invalid/bar/")
|
||||
original_config.AddOption("backend2", "secret", string(testBackendSecret)+"-backend2")
|
||||
o_cfg, err := NewBackendConfiguration(logger, original_config, nil)
|
||||
o_cfg, err := NewBackendConfigurationWithStats(logger, original_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
new_config := goconf.NewConfigFile()
|
||||
new_config.AddOption("backend", "backends", "backend1")
|
||||
new_config.AddOption("backend", "allowall", "false")
|
||||
new_config.AddOption("backend1", "url", "http://domain1.invalid/foo/")
|
||||
new_config.AddOption("backend1", "secret", string(testBackendSecret)+"-backend1")
|
||||
n_cfg, err := NewBackendConfiguration(logger, new_config, nil)
|
||||
n_cfg, err := NewBackendConfigurationWithStats(logger, new_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 3)
|
||||
assert.Equal(3, stats.value)
|
||||
original_config.RemoveOption("backend", "backends")
|
||||
original_config.AddOption("backend", "backends", "backend1")
|
||||
original_config.RemoveSection("backend2")
|
||||
|
||||
o_cfg.Reload(original_config)
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
if !reflect.DeepEqual(n_cfg, o_cfg) {
|
||||
assert.Fail(t, "BackendConfiguration should be equal after Reload")
|
||||
assert.Fail("BackendConfiguration should be equal after Reload")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -468,8 +500,9 @@ func mustParse(s string) *url.URL {
|
|||
return p
|
||||
}
|
||||
|
||||
func TestBackendConfiguration_EtcdCompat(t *testing.T) { // nolint:paralleltest
|
||||
ResetStatsValue(t, statsBackendsCurrent)
|
||||
func TestBackendConfiguration_EtcdCompat(t *testing.T) {
|
||||
t.Parallel()
|
||||
stats := &mockBackendStats{}
|
||||
|
||||
logger := NewLoggerForTest(t)
|
||||
require := require.New(t)
|
||||
|
|
@ -486,9 +519,7 @@ func TestBackendConfiguration_EtcdCompat(t *testing.T) { // nolint:paralleltest
|
|||
config.AddOption("backend", "backendtype", "etcd")
|
||||
config.AddOption("backend", "backendprefix", "/backends")
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 0)
|
||||
|
||||
cfg, err := NewBackendConfiguration(logger, config, client)
|
||||
cfg, err := NewBackendConfigurationWithStats(logger, config, client, stats)
|
||||
require.NoError(err)
|
||||
defer cfg.Close()
|
||||
|
||||
|
|
@ -511,7 +542,7 @@ func TestBackendConfiguration_EtcdCompat(t *testing.T) { // nolint:paralleltest
|
|||
drainWakeupChannel(ch)
|
||||
SetEtcdValue(etcd, "/backends/1_one", []byte("{\"url\":\""+url1+"\",\"secret\":\""+secret1+"\"}"))
|
||||
<-ch
|
||||
checkStatsValue(t, statsBackendsCurrent, 1)
|
||||
assert.Equal(1, stats.value)
|
||||
if backends := sortBackends(cfg.GetBackends()); assert.Len(backends, 1) &&
|
||||
assert.Equal([]string{url1}, backends[0].urls) &&
|
||||
assert.Equal(secret1, string(backends[0].secret)) {
|
||||
|
|
@ -526,7 +557,7 @@ func TestBackendConfiguration_EtcdCompat(t *testing.T) { // nolint:paralleltest
|
|||
drainWakeupChannel(ch)
|
||||
SetEtcdValue(etcd, "/backends/2_two", []byte("{\"url\":\""+url2+"\",\"secret\":\""+secret2+"\"}"))
|
||||
<-ch
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
if backends := sortBackends(cfg.GetBackends()); assert.Len(backends, 2) &&
|
||||
assert.Equal([]string{url1}, backends[0].urls) &&
|
||||
assert.Equal(secret1, string(backends[0].secret)) &&
|
||||
|
|
@ -545,7 +576,7 @@ func TestBackendConfiguration_EtcdCompat(t *testing.T) { // nolint:paralleltest
|
|||
drainWakeupChannel(ch)
|
||||
SetEtcdValue(etcd, "/backends/3_three", []byte("{\"url\":\""+url3+"\",\"secret\":\""+secret3+"\"}"))
|
||||
<-ch
|
||||
checkStatsValue(t, statsBackendsCurrent, 3)
|
||||
assert.Equal(3, stats.value)
|
||||
if backends := sortBackends(cfg.GetBackends()); assert.Len(backends, 3) &&
|
||||
assert.Equal([]string{url1}, backends[0].urls) &&
|
||||
assert.Equal(secret1, string(backends[0].secret)) &&
|
||||
|
|
@ -565,7 +596,7 @@ func TestBackendConfiguration_EtcdCompat(t *testing.T) { // nolint:paralleltest
|
|||
drainWakeupChannel(ch)
|
||||
DeleteEtcdValue(etcd, "/backends/1_one")
|
||||
<-ch
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
if backends := sortBackends(cfg.GetBackends()); assert.Len(backends, 2) {
|
||||
assert.Equal([]string{url2}, backends[0].urls)
|
||||
assert.Equal(secret2, string(backends[0].secret))
|
||||
|
|
@ -576,7 +607,7 @@ func TestBackendConfiguration_EtcdCompat(t *testing.T) { // nolint:paralleltest
|
|||
drainWakeupChannel(ch)
|
||||
DeleteEtcdValue(etcd, "/backends/2_two")
|
||||
<-ch
|
||||
checkStatsValue(t, statsBackendsCurrent, 1)
|
||||
assert.Equal(1, stats.value)
|
||||
if backends := sortBackends(cfg.GetBackends()); assert.Len(backends, 1) {
|
||||
assert.Equal([]string{url3}, backends[0].urls)
|
||||
assert.Equal(secret3, string(backends[0].secret))
|
||||
|
|
@ -629,8 +660,9 @@ func TestBackendCommonSecret(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestBackendChangeUrls(t *testing.T) { // nolint:paralleltest
|
||||
ResetStatsValue(t, statsBackendsCurrent)
|
||||
func TestBackendChangeUrls(t *testing.T) {
|
||||
t.Parallel()
|
||||
stats := &mockBackendStats{}
|
||||
|
||||
logger := NewLoggerForTest(t)
|
||||
require := require.New(t)
|
||||
|
|
@ -645,12 +677,10 @@ func TestBackendChangeUrls(t *testing.T) { // nolint:paralleltest
|
|||
original_config.AddOption("backend1", "urls", u1.String())
|
||||
original_config.AddOption("backend2", "urls", u2.String())
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 0)
|
||||
|
||||
cfg, err := NewBackendConfiguration(logger, original_config, nil)
|
||||
cfg, err := NewBackendConfigurationWithStats(logger, original_config, nil, stats)
|
||||
require.NoError(err)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
if b1 := cfg.GetBackend(u1); assert.NotNil(b1) {
|
||||
assert.Equal("backend1", b1.Id())
|
||||
assert.Equal(string(testBackendSecret), string(b1.Secret()))
|
||||
|
|
@ -670,7 +700,7 @@ func TestBackendChangeUrls(t *testing.T) { // nolint:paralleltest
|
|||
updated_config.AddOption("backend1", "urls", strings.Join([]string{u1.String(), u2.String()}, ","))
|
||||
cfg.Reload(updated_config)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 1)
|
||||
assert.Equal(1, stats.value)
|
||||
if b1 := cfg.GetBackend(u1); assert.NotNil(b1) {
|
||||
assert.Equal("backend1", b1.Id())
|
||||
assert.Equal(string(testBackendSecret)+"-backend1", string(b1.Secret()))
|
||||
|
|
@ -684,7 +714,7 @@ func TestBackendChangeUrls(t *testing.T) { // nolint:paralleltest
|
|||
|
||||
// No change reload.
|
||||
cfg.Reload(updated_config)
|
||||
checkStatsValue(t, statsBackendsCurrent, 1)
|
||||
assert.Equal(1, stats.value)
|
||||
if b1 := cfg.GetBackend(u1); assert.NotNil(b1) {
|
||||
assert.Equal("backend1", b1.Id())
|
||||
assert.Equal(string(testBackendSecret)+"-backend1", string(b1.Secret()))
|
||||
|
|
@ -703,7 +733,7 @@ func TestBackendChangeUrls(t *testing.T) { // nolint:paralleltest
|
|||
updated_config.AddOption("backend1", "urls", u2.String())
|
||||
cfg.Reload(updated_config)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 1)
|
||||
assert.Equal(1, stats.value)
|
||||
if b1 := cfg.GetBackend(u2); assert.NotNil(b1) {
|
||||
assert.Equal("backend1", b1.Id())
|
||||
assert.Equal(string(testBackendSecret), string(b1.Secret()))
|
||||
|
|
@ -715,13 +745,14 @@ func TestBackendChangeUrls(t *testing.T) { // nolint:paralleltest
|
|||
updated_config.AddOption("backend", "secret", string(testBackendSecret))
|
||||
cfg.Reload(updated_config)
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 0)
|
||||
assert.Equal(0, stats.value)
|
||||
b1 := cfg.GetBackend(u2)
|
||||
assert.Nil(b1)
|
||||
}
|
||||
|
||||
func TestBackendConfiguration_EtcdChangeUrls(t *testing.T) { // nolint:paralleltest
|
||||
ResetStatsValue(t, statsBackendsCurrent)
|
||||
func TestBackendConfiguration_EtcdChangeUrls(t *testing.T) {
|
||||
t.Parallel()
|
||||
stats := &mockBackendStats{}
|
||||
|
||||
logger := NewLoggerForTest(t)
|
||||
require := require.New(t)
|
||||
|
|
@ -738,9 +769,7 @@ func TestBackendConfiguration_EtcdChangeUrls(t *testing.T) { // nolint:parallelt
|
|||
config.AddOption("backend", "backendtype", "etcd")
|
||||
config.AddOption("backend", "backendprefix", "/backends")
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 0)
|
||||
|
||||
cfg, err := NewBackendConfiguration(logger, config, client)
|
||||
cfg, err := NewBackendConfigurationWithStats(logger, config, client, stats)
|
||||
require.NoError(err)
|
||||
defer cfg.Close()
|
||||
|
||||
|
|
@ -752,7 +781,7 @@ func TestBackendConfiguration_EtcdChangeUrls(t *testing.T) { // nolint:parallelt
|
|||
|
||||
require.NoError(storage.WaitForInitialized(ctx))
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 1)
|
||||
assert.Equal(1, stats.value)
|
||||
if backends := sortBackends(cfg.GetBackends()); assert.Len(backends, 1) &&
|
||||
assert.Equal([]string{url1}, backends[0].Urls()) &&
|
||||
assert.Equal(initialSecret1, string(backends[0].Secret())) {
|
||||
|
|
@ -766,7 +795,7 @@ func TestBackendConfiguration_EtcdChangeUrls(t *testing.T) { // nolint:parallelt
|
|||
drainWakeupChannel(ch)
|
||||
SetEtcdValue(etcd, "/backends/1_one", []byte("{\"urls\":[\""+url1+"\",\""+url2+"\"],\"secret\":\""+secret1+"\"}"))
|
||||
<-ch
|
||||
checkStatsValue(t, statsBackendsCurrent, 1)
|
||||
assert.Equal(1, stats.value)
|
||||
if backends := sortBackends(cfg.GetBackends()); assert.Len(backends, 1) &&
|
||||
assert.Equal([]string{url2, url1}, backends[0].Urls()) &&
|
||||
assert.Equal(secret1, string(backends[0].Secret())) {
|
||||
|
|
@ -786,7 +815,7 @@ func TestBackendConfiguration_EtcdChangeUrls(t *testing.T) { // nolint:parallelt
|
|||
drainWakeupChannel(ch)
|
||||
SetEtcdValue(etcd, "/backends/3_three", []byte("{\"urls\":[\""+url3+"\",\""+url4+"\"],\"secret\":\""+secret3+"\"}"))
|
||||
<-ch
|
||||
checkStatsValue(t, statsBackendsCurrent, 2)
|
||||
assert.Equal(2, stats.value)
|
||||
if backends := sortBackends(cfg.GetBackends()); assert.Len(backends, 2) &&
|
||||
assert.Equal([]string{url2, url1}, backends[0].Urls()) &&
|
||||
assert.Equal(secret1, string(backends[0].Secret())) &&
|
||||
|
|
@ -806,7 +835,7 @@ func TestBackendConfiguration_EtcdChangeUrls(t *testing.T) { // nolint:parallelt
|
|||
drainWakeupChannel(ch)
|
||||
DeleteEtcdValue(etcd, "/backends/1_one")
|
||||
<-ch
|
||||
checkStatsValue(t, statsBackendsCurrent, 1)
|
||||
assert.Equal(1, stats.value)
|
||||
if backends := sortBackends(cfg.GetBackends()); assert.Len(backends, 1) {
|
||||
assert.Equal([]string{url3, url4}, backends[0].Urls())
|
||||
assert.Equal(secret3, string(backends[0].Secret()))
|
||||
|
|
@ -816,7 +845,7 @@ func TestBackendConfiguration_EtcdChangeUrls(t *testing.T) { // nolint:parallelt
|
|||
DeleteEtcdValue(etcd, "/backends/3_three")
|
||||
<-ch
|
||||
|
||||
checkStatsValue(t, statsBackendsCurrent, 0)
|
||||
assert.Equal(0, stats.value)
|
||||
storage.mu.RLock()
|
||||
_, found := storage.backends["domain1.invalid"]
|
||||
storage.mu.RUnlock()
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ type backendStorageEtcd struct {
|
|||
closeFunc context.CancelFunc
|
||||
}
|
||||
|
||||
func NewBackendStorageEtcd(logger Logger, config *goconf.ConfigFile, etcdClient *EtcdClient) (BackendStorage, error) {
|
||||
func NewBackendStorageEtcd(logger Logger, config *goconf.ConfigFile, etcdClient *EtcdClient, stats BackendStorageStats) (BackendStorage, error) {
|
||||
if etcdClient == nil || !etcdClient.IsConfigured() {
|
||||
return nil, errors.New("no etcd endpoints configured")
|
||||
}
|
||||
|
|
@ -64,6 +64,7 @@ func NewBackendStorageEtcd(logger Logger, config *goconf.ConfigFile, etcdClient
|
|||
result := &backendStorageEtcd{
|
||||
backendStorageCommon: backendStorageCommon{
|
||||
backends: make(map[string][]*Backend),
|
||||
stats: stats,
|
||||
},
|
||||
logger: logger,
|
||||
etcdClient: etcdClient,
|
||||
|
|
@ -231,7 +232,7 @@ func (s *backendStorageEtcd) EtcdKeyUpdated(client *EtcdClient, key string, data
|
|||
}
|
||||
updateBackendStats(backend)
|
||||
if added {
|
||||
statsBackendsCurrent.Inc()
|
||||
s.stats.IncBackends()
|
||||
}
|
||||
s.wakeupForTesting()
|
||||
}
|
||||
|
|
@ -275,7 +276,7 @@ func (s *backendStorageEtcd) EtcdKeyDeleted(client *EtcdClient, key string, prev
|
|||
if !seen[entry.Id()] {
|
||||
seen[entry.Id()] = true
|
||||
updateBackendStats(entry)
|
||||
statsBackendsCurrent.Dec()
|
||||
s.stats.DecBackends()
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ type backendStorageStatic struct {
|
|||
compatBackend *Backend
|
||||
}
|
||||
|
||||
func NewBackendStorageStatic(logger Logger, config *goconf.ConfigFile) (BackendStorage, error) {
|
||||
func NewBackendStorageStatic(logger Logger, config *goconf.ConfigFile, stats BackendStorageStats) (BackendStorage, error) {
|
||||
allowAll, _ := config.GetBool("backend", "allowall")
|
||||
allowHttp, _ := config.GetBool("backend", "allowhttp")
|
||||
commonSecret, _ := GetStringOptionWithEnv(config, "backend", "secret")
|
||||
|
|
@ -157,10 +157,11 @@ func NewBackendStorageStatic(logger Logger, config *goconf.ConfigFile) (BackendS
|
|||
logger.Printf("WARNING: No backends configured, client connections will not be possible.")
|
||||
}
|
||||
|
||||
statsBackendsCurrent.Add(float64(numBackends))
|
||||
stats.AddBackends(numBackends)
|
||||
return &backendStorageStatic{
|
||||
backendStorageCommon: backendStorageCommon{
|
||||
backends: backends,
|
||||
stats: stats,
|
||||
},
|
||||
|
||||
logger: logger,
|
||||
|
|
@ -196,7 +197,7 @@ func (s *backendStorageStatic) RemoveBackendsForHost(host string, seen map[strin
|
|||
backend.counted = false
|
||||
}
|
||||
}
|
||||
statsBackendsCurrent.Sub(float64(deleted))
|
||||
s.stats.RemoveBackends(deleted)
|
||||
}
|
||||
delete(s.backends, host)
|
||||
}
|
||||
|
|
@ -247,7 +248,7 @@ func (s *backendStorageStatic) UpsertHost(host string, backends []*Backend, seen
|
|||
if len(urls) == len(removed.urls) && removed.counted {
|
||||
deleteBackendStats(removed)
|
||||
delete(s.backendsById, removed.Id())
|
||||
statsBackendsCurrent.Dec()
|
||||
s.stats.DecBackends()
|
||||
removed.counted = false
|
||||
}
|
||||
}
|
||||
|
|
@ -276,7 +277,7 @@ func (s *backendStorageStatic) UpsertHost(host string, backends []*Backend, seen
|
|||
added.counted = true
|
||||
}
|
||||
}
|
||||
statsBackendsCurrent.Add(float64(addedBackends))
|
||||
s.stats.AddBackends(addedBackends)
|
||||
}
|
||||
|
||||
func getConfiguredBackendIDs(backendIds string) (ids []string) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue