fix host index keepalive

Author: luke-lombardi

pkg/metadata.go

@@ -323,12 +323,7 @@ func (m *BlobCacheMetadata) GetAvailableHosts(ctx context.Context, removeHostCal
 }
 
 func (m *BlobCacheMetadata) AddHostToIndex(ctx context.Context, host *BlobCacheHost) error {
-	err := m.rdb.SAdd(ctx, MetadataKeys.MetadataHostIndex(), host.Addr).Err()
-	if err != nil {
-		return err
-	}
-
-	return m.SetHostKeepAlive(ctx, host)
+	return m.rdb.SAdd(ctx, MetadataKeys.MetadataHostIndex(), host.Addr).Err()
 }
 
 func (m *BlobCacheMetadata) RemoveHostFromIndex(ctx context.Context, host *BlobCacheHost) error {
@@ -341,11 +336,6 @@ func (m *BlobCacheMetadata) SetHostKeepAlive(ctx context.Context, host *BlobCach
 		return err
 	}
 
-	err = m.AddHostToIndex(ctx, host)
-	if err != nil {
-		return err
-	}
-
 	return m.rdb.Set(ctx, MetadataKeys.MetadataHostKeepAlive(host.Addr), hostBytes, time.Duration(defaultHostKeepAliveTimeoutS)*time.Second).Err()
 }
 

pkg/server.go

@@ -99,9 +99,14 @@ func NewCacheService(ctx context.Context, cfg BlobCacheConfig) (*CacheService, e
 }
 
 func (cs *CacheService) HostKeepAlive() {
-	err := cs.metadata.AddHostToIndex(cs.ctx, cs.cas.currentHost)
+	err := cs.metadata.SetHostKeepAlive(cs.ctx, cs.cas.currentHost)
 	if err != nil {
-		Logger.Fatalf("Failed to add host to index: %v", err)
+		Logger.Warnf("Failed to set host keepalive: %v", err)
+	}
+
+	err = cs.metadata.AddHostToIndex(cs.ctx, cs.cas.currentHost)
+	if err != nil {
+		Logger.Warnf("Failed to add host to index: %v", err)
 	}
 
 	ticker := time.NewTicker(time.Duration(defaultHostKeepAliveIntervalS) * time.Second)
@@ -114,6 +119,8 @@ func (cs *CacheService) HostKeepAlive() {
 		case <-ticker.C:
 			cs.cas.currentHost.PrivateAddr = fmt.Sprintf("%s:%d", cs.privateIpAddr, cs.cfg.Port)
 			cs.cas.currentHost.CapacityUsagePct = cs.usagePct()
+
+			cs.metadata.AddHostToIndex(cs.ctx, cs.cas.currentHost)
 			cs.metadata.SetHostKeepAlive(cs.ctx, cs.cas.currentHost)
 		}
 	}