Changeset 608 in code

Timestamp:

Oct 6, 2021, 9:41:39 AM (4 years ago)

Author:

contact

Message:

msgstore_fs: add limit on number of opened files

File:

• trunk/msgstore_fs.go (modified) (6 diffs)

trunk/msgstore_fs.go

@@ -15 +15 @@
 )
 
-const fsMessageStoreMaxTries = 100
+const (
+        fsMessageStoreMaxFiles = 20
+        fsMessageStoreMaxTries = 100
+)
 
 func escapeFilename(unsafe string) (safe string) {
@@ -66 +69 @@
 }
 
+type fsMessageStoreFile struct {
+        *os.File
+        lastUse time.Time
+}
+
 // fsMessageStore is a per-user on-disk store for IRC messages.
 type fsMessageStore struct {
         root string
 
-        files map[string]*os.File // indexed by entity
+        // Write-only files used by Append
+        files map[string]*fsMessageStoreFile // indexed by entity
 }
 
@@ -79 +88 @@
         return &fsMessageStore{
                 root:  filepath.Join(root, escapeFilename(username)),
-                files: make(map[string]*os.File),
+                files: make(map[string]*fsMessageStoreFile),
         }
 }
@@ -127 +136 @@
         }
 
-        // TODO: enforce maximum open file handles (LRU cache of file handles)
         f := ms.files[entity]
 
@@ -133 +141 @@
         path := ms.logPath(network, entity, t)
         if f == nil || f.Name() != path {
-                if f != nil {
-                        f.Close()
-                }
-
                 dir := filepath.Dir(path)
                 if err := os.MkdirAll(dir, 0750); err != nil {
@@ -142 +146 @@
                 }
 
-                var err error
-                f, err = os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0640)
+                ff, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0640)
                 if err != nil {
                         return "", fmt.Errorf("failed to open message log file %q: %v", path, err)
                 }
 
+                if f != nil {
+                        f.Close()
+                }
+                f = &fsMessageStoreFile{File: ff}
                 ms.files[entity] = f
         }
 
-        msgID, err := nextFSMsgID(network, entity, t, f)
+        f.lastUse = time.Now()
+
+        if len(ms.files) > fsMessageStoreMaxFiles {
+                entities := make([]string, 0, len(ms.files))
+                for name := range ms.files {
+                        entities = append(entities, name)
+                }
+                sort.Slice(entities, func(i, j int) bool {
+                        a, b := entities[i], entities[j]
+                        return ms.files[a].lastUse.Before(ms.files[b].lastUse)
+                })
+                entities = entities[0 : len(entities)-fsMessageStoreMaxFiles]
+                for _, name := range entities {
+                        ms.files[name].Close()
+                        delete(ms.files, name)
+                }
+        }
+
+        msgID, err := nextFSMsgID(network, entity, t, f.File)
         if err != nil {
                 return "", fmt.Errorf("failed to generate message ID: %v", err)