Add gc for file storage. (v6d-io#1862)

- Add file storage gc for each client. - Add global storage to scan dir and delete outdated files. - Fix bugs in Update when delete files that do not meet requirements. Fixes v6d-io#1861 Signed-off-by: vegetableysm <[email protected]>
sighingnow · Apr 16, 2024 · 5a400fb · 5a400fb
1 parent 78e236e
commit 5a400fb
Show file tree

Hide file tree

Showing 11 changed files with 662 additions and 49 deletions.
diff --git a/modules/llm-cache/ds/config.h b/modules/llm-cache/ds/config.h
@@ -53,16 +53,32 @@ struct FileCacheConfig : public KVCacheConfig {
  int splitNumber;
  std::string root;
  FilesystemType filesystemType;
+ int clientGCInterval; // second
+ int ttl; // second
+ bool enbaleGlobalGC;
+ int globalGCInterval; // second
+ int globalTTL; // second
 
+ // Default gc interval is 30 minutes and default global gc interval is 3
+ // hours.
  FileCacheConfig(int tensorByte = 10, int cacheCapacity = 10, int layer = 1,
  int batchSize = 4, int splitNumber = 2,
  std::string root = "/tmp/llm_cache/",
- FilesystemType filesystemType = LOCAL)
+ FilesystemType filesystemType = LOCAL,
+ int clientGCInterval = 30 * 60, int ttl = 30 * 60,
+ bool enbaleGlobalGC = false,
+ int globalGCInterval = 3 * 60 * 60,
+ int globalTTL = 3 * 60 * 60)
  : KVCacheConfig{tensorByte, cacheCapacity, layer} {
  this->root = root;
  this->batchSize = batchSize;
  this->splitNumber = splitNumber;
  this->filesystemType = filesystemType;
+ this->clientGCInterval = clientGCInterval;
+ this->ttl = ttl;
+ this->enbaleGlobalGC = enbaleGlobalGC;
+ this->globalGCInterval = globalGCInterval;
+ this->globalTTL = globalTTL;
  }
 };
 

diff --git a/modules/llm-cache/ds/kv_state_cache_manager.cc b/modules/llm-cache/ds/kv_state_cache_manager.cc
@@ -78,11 +78,13 @@ Status KVStateCacheManager::Make(std::shared_ptr<KVStateCacheManager>& manager,
  if (config.filesystemType == FilesystemType::LOCAL) {
  file_storage = std::make_shared<LocalFileStorage>(
  config.tensorByte, config.cacheCapacity, config.layer, config.batchSize,
- config.splitNumber, config.root);
+ config.splitNumber, config.root, config.clientGCInterval, config.ttl,
+ config.enbaleGlobalGC, config.globalGCInterval, config.globalTTL);
  } else {
  return Status::Invalid("Unsupported filesystem type");
  }
  manager = std::make_shared<KVStateCacheManager>(file_storage);
+ RETURN_ON_ERROR(file_storage->Init());
  manager->config = std::make_shared<FileCacheConfig>(config);
  return Status::OK();
 }
@@ -400,12 +402,15 @@ Status KVStateCacheManager::ClearGlobalCache(Client& client,
  config.llmRefcntObjectName);
 }
 
-Status ClearGlobalCache(Client& client, FileCacheConfig& config) {
- // TBD
- return Status::OK();
+void KVStateCacheManager::Close() { storage->CloseCache(); }
+
+void KVStateCacheManager::StopGlobalGCThread() {
+ storage->StopGlobalGCThread();
 }
 
-void KVStateCacheManager::Close() { storage->CloseCache(); }
+void KVStateCacheManager::StartGlobalGCThread() {
+ storage->StartGlobalGCThread();
+}
 
 KVStateCacheManager::~KVStateCacheManager() {}
 

diff --git a/modules/llm-cache/ds/kv_state_cache_manager.h b/modules/llm-cache/ds/kv_state_cache_manager.h
@@ -64,9 +64,11 @@ class KVStateCacheManager {
 
  void Close();
 
- static Status ClearGlobalCache(Client& client, VineyardCacheConfig& config);
+ void StopGlobalGCThread();
+
+ void StartGlobalGCThread();
 
- static Status ClearGlobalCache(Client& client, FileCacheConfig& config);
+ static Status ClearGlobalCache(Client& client, VineyardCacheConfig& config);
 
  std::shared_ptr<KVCacheConfig> Config() { return config; }