Merge pull request #133 from XenitAB/feature/peer-readiness

Use routing table size for readiness check

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#117](https://github.com/XenitAB/spegel/pull/117) Update Containerd client to 1.7.
 - [#126](https://github.com/XenitAB/spegel/pull/126) Refactor registry implementation to not require separate handler.
 - [#132](https://github.com/XenitAB/spegel/pull/132) Extend tests to validate single node and mirror fallback.
+- [#133](https://github.com/XenitAB/spegel/pull/133) Use routing table size for readiness check.
 
 ### Deprecated
 

Makefile

@@ -82,6 +82,14 @@ e2e: docker-build
 		exit 1
 	fi
 
+	# Verify that Spegel has never restarted
+	RESTART_COUNT=$$(kubectl --kubeconfig $$KIND_KUBECONFIG --namespace spegel get pods -o=jsonpath='{.items[*].status.containerStatuses[0].restartCount}')
+	if [[ $$RESTART_COUNT != "0" ]]
+	then
+		echo "Spegel should not have restarted during tests."
+		exit 1
+	fi
+
 	# Delete cluster
 	kind delete cluster
 

internal/registry/registry.go

@@ -71,6 +71,17 @@ func (r *Registry) Server(addr string, log logr.Logger) *http.Server {
 }
 
 func (r *Registry) readyHandler(c *gin.Context) {
+	ok, err := r.router.HasMirrors()
+	if err != nil {
+		//nolint:errcheck // ignore
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+	if !ok {
+		c.Status(http.StatusInternalServerError)
+		return
+
+	}
 	c.Status(http.StatusOK)
 }
 
@@ -139,7 +150,6 @@ func (r *Registry) registryHandler(c *gin.Context) {
 	c.Status(http.StatusNotFound)
 }
 
-// TODO: Explore if it is worth returning early if router is not populated.
 func (r *Registry) handleMirror(c *gin.Context, key string) {
 	c.Set("handler", "mirror")
 

internal/routing/mock.go

@@ -18,6 +18,10 @@ func (m *MockRouter) Close() error {
 	return nil
 }
 
+func (m *MockRouter) HasMirrors() (bool, error) {
+	return true, nil
+}
+
 func (m *MockRouter) Resolve(ctx context.Context, key string, allowSelf bool, count int) (<-chan string, error) {
 	peerCh := make(chan string, count)
 	peers, ok := m.resolver[key]

internal/routing/p2p.go

@@ -18,7 +18,9 @@ import (
 )
 
 type P2PRouter struct {
+	b            Bootstrapper
 	host         host.Host
+	kdht         *dht.IpfsDHT
 	rd           *routing.RoutingDiscovery
 	registryPort string
 }
@@ -89,7 +91,9 @@ func NewP2PRouter(ctx context.Context, addr string, b Bootstrapper, registryPort
 	rd := routing.NewRoutingDiscovery(kdht)
 
 	return &P2PRouter{
+		b:            b,
 		host:         host,
+		kdht:         kdht,
 		rd:           rd,
 		registryPort: registryPort,
 	}, nil
@@ -99,6 +103,20 @@ func (r *P2PRouter) Close() error {
 	return r.host.Close()
 }
 
+func (r *P2PRouter) HasMirrors() (bool, error) {
+	addrInfo, err := r.b.GetAddress()
+	if err != nil {
+		return false, err
+	}
+	if addrInfo.ID == r.host.ID() {
+		return true, nil
+	}
+	if r.kdht.RoutingTable().Size() == 0 {
+		return false, nil
+	}
+	return true, nil
+}
+
 func (r *P2PRouter) Resolve(ctx context.Context, key string, allowSelf bool, count int) (<-chan string, error) {
 	log := logr.FromContextOrDiscard(ctx).WithValues("host", r.host.ID().Pretty(), "key", key)
 	c, err := createCid(key)

internal/routing/routing.go

@@ -11,4 +11,5 @@ type Router interface {
 	Close() error
 	Resolve(ctx context.Context, key string, allowSelf bool, count int) (<-chan string, error)
 	Advertise(ctx context.Context, keys []string) error
+	HasMirrors() (bool, error)
 }