feat: add peer manager for persistent cache task (#3592)

Signed-off-by: Gaius <gaius.qi@gmail.com>
dragonflyoss · Oct 22, 2024 · 2e1a6b5 · 2e1a6b5
1 parent 4c50a0d
commit 2e1a6b5
Show file tree

Hide file tree

Showing 7 changed files with 328 additions and 79 deletions.
diff --git a/internal/dflog/logger.go b/internal/dflog/logger.go
@@ -141,15 +141,15 @@ func WithTask(taskID, url string) *SugaredLoggerOnWith {
 	}
 }
 
-func WithPersistentCacheTask(taskID string) *SugaredLoggerOnWith {
+func WithHost(hostID, hostname, ip string) *SugaredLoggerOnWith {
 	return &SugaredLoggerOnWith{
-		withArgs: []any{"taskID", taskID},
+		withArgs: []any{"hostID", hostID, "hostname", hostname, "ip", ip},
 	}
 }
 
-func WithHost(hostID, hostname, ip string) *SugaredLoggerOnWith {
+func WithPeerID(peerID string) *SugaredLoggerOnWith {
 	return &SugaredLoggerOnWith{
-		withArgs: []any{"hostID", hostID, "hostname", hostname, "ip", ip},
+		withArgs: []any{"peerID", peerID},
 	}
 }
 

diff --git a/pkg/redis/redis.go b/pkg/redis/redis.go
@@ -141,11 +141,17 @@ func MakePersistentCacheTasksInScheduler(schedulerClusterID uint) string {
 	return MakeKeyInScheduler(SchedulerClustersNamespace, fmt.Sprintf("%d:%s", schedulerClusterID, PersistentCacheTasksNamespace))
 }
 
+// MakePersistentCachePeersOfPersistentCacheTaskInScheduler make persistent cache peers of persistent cache task in scheduler.
+func MakePersistentCachePeersOfPersistentCacheTaskInScheduler(schedulerClusterID uint, taskID string) string {
+	return MakeKeyInScheduler(SchedulerClustersNamespace, fmt.Sprintf("%d:%s:%s:%s", schedulerClusterID, PersistentCacheTasksNamespace, taskID, PersistentCachePeersNamespace))
+}
+
 // MakePersistentCachePeerKeyInScheduler make persistent cache peer key in scheduler.
 func MakePersistentCachePeerKeyInScheduler(schedulerClusterID uint, peerID string) string {
 	return MakeKeyInScheduler(SchedulerClustersNamespace, fmt.Sprintf("%d:%s:%s", schedulerClusterID, PersistentCachePeersNamespace, peerID))
 }
 
+// MakePersistentCachePeersInScheduler make persistent cache peers in scheduler.
 func MakePersistentCachePeersInScheduler(schedulerClusterID uint) string {
 	return MakeKeyInScheduler(SchedulerClustersNamespace, fmt.Sprintf("%d:%s", schedulerClusterID, PersistentCachePeersNamespace))
 }
@@ -159,3 +165,8 @@ func MakePersistentCacheHostKeyInScheduler(schedulerClusterID uint, hostID strin
 func MakePersistentCacheHostsInScheduler(schedulerClusterID uint) string {
 	return MakeKeyInScheduler(SchedulerClustersNamespace, fmt.Sprintf("%d:%s", schedulerClusterID, PersistentCacheHostsNamespace))
 }
+
+// MakePersistentCachePeersOfPersistentCacheHostInScheduler make persistent cache peers of persistent cache host in scheduler.
+func MakePersistentCachePeersOfPersistentCacheHostInScheduler(schedulerClusterID uint, hostID string) string {
+	return MakeKeyInScheduler(SchedulerClustersNamespace, fmt.Sprintf("%d:%s:%s:%s", schedulerClusterID, PersistentCacheHostsNamespace, hostID, PersistentCachePeersNamespace))
+}