Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
16 changes: 9 additions & 7 deletions rest/admin_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -512,15 +512,17 @@ func (h *handler) handleGetConfig() error {
return err
}

replications, err := database.SGReplicateMgr.GetReplications()
if err != nil {
return err
}
if database.SGReplicateMgr != nil {
replications, err := database.SGReplicateMgr.GetReplications()
if err != nil {
return err
}

dbConfig.Replications = make(map[string]*db.ReplicationConfig, len(replications))
dbConfig.Replications = make(map[string]*db.ReplicationConfig, len(replications))

for replicationName, replicationConfig := range replications {
dbConfig.Replications[replicationName] = replicationConfig.ReplicationConfig.Redacted(h.ctx())
for replicationName, replicationConfig := range replications {
dbConfig.Replications[replicationName] = replicationConfig.ReplicationConfig.Redacted(h.ctx())
}
}
}

Expand Down
35 changes: 35 additions & 0 deletions rest/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"strconv"
"strings"
"sync"
"sync/atomic"
"testing"
"time"

Expand Down Expand Up @@ -3710,3 +3711,37 @@ func TestUnsupportedServerConfigOptions(t *testing.T) {
})
}
}

func TestGetConfigAfterFailToStartOnlineProcess(t *testing.T) {
rt := NewRestTester(t, &RestTesterConfig{
PersistentConfig: true,
})
defer rt.Close()

dbConfig := rt.NewDbConfig()
dbConfig.StartOffline = base.Ptr(true)
resp := rt.CreateDatabase("db", dbConfig)
RequireStatus(t, resp, http.StatusCreated)

// create invalid user to cause StartOnlineProcesses error
rt.GetDatabase().Options.ConfigPrincipals.Users = map[string]*auth.PrincipalConfig{
"alice": {
JWTChannels: base.SetOf("asdf"),
},
}

// simulate regular startup
atomic.StoreUint32(&rt.GetDatabase().State, db.DBStarting)
rt.WaitForDBState(db.RunStateString[db.DBStarting])

// Can't trigger error case from REST API - call directly
rt.ServerContext().asyncDatabaseOnline(base.NewNonCancelCtx(), rt.GetDatabase(), nil, rt.ServerContext().GetDbVersion("db"))

// Error should cause db to stay offline.
rt.WaitForDBState(db.RunStateString[db.DBOffline])
require.Equal(t, int64(1), rt.GetDatabase().DbStats.Database().TotalOnlineFatalErrors.Value())

// Original bug will trigger panic here on this endpoint
resp = rt.SendAdminRequest(http.MethodGet, "/_config?include_runtime=true", "")
RequireStatus(t, resp, http.StatusOK)
}
Loading