Fix DB GC

immesys · Oct 18, 2018 · 8750a24 · 8750a24
1 parent 0459c97
commit 8750a24
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 18 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/core/queues.go b/core/queues.go
@@ -242,10 +242,21 @@ func NewQManager(cfg *QManagerConfig) (*QManager, error) {
 		return nil, err
 	}
 	go rv.bgTasks()
+	go rv.trimDB()
 
 	return rv, nil
 }
 
+func (qm *QManager) trimDB() {
+	for {
+		time.Sleep(5 * time.Minute)
+	again:
+		err := qm.db.RunValueLogGC(0.5)
+		if err == nil {
+			goto again
+		}
+	}
+}
 func (qm *QManager) Shutdown() {
 	qm.qzmu.Lock()
 	for _, q := range qm.qz {

diff --git a/core/routing.go b/core/routing.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/dgraph-io/badger"
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/immesys/wave/wve"
 	pb "github.com/immesys/wavemq/mqpb"
 	"github.com/prometheus/client_golang/prometheus"
@@ -286,9 +286,20 @@ func NewTerminus(qm *QManager, am *AuthModule, cfg *RoutingConfig) (*Terminus, e
 
 	//Run the BG tasks
 	go rv.bgTasks()
+	go rv.trimDB()
 	return rv, nil
 }
 
+func (t *Terminus) trimDB() {
+	for {
+		time.Sleep(30 * time.Minute)
+	again:
+		err := t.db.RunValueLogGC(0.5)
+		if err == nil {
+			goto again
+		}
+	}
+}
 func (t *Terminus) RouterID() string {
 	return t.ourNodeId
 }