From 3d7390302d9b3b1e1bbbd23653dc52bdc3bd27c4 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Mon, 29 Nov 2021 00:49:49 -0800
Subject: [PATCH] add s3.clean.uploads -timeAgo=24h
---
weed/command/scaffold/master.toml | 1 +
weed/server/master_server.go | 19 +++++++++++++++----
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/weed/command/scaffold/master.toml b/weed/command/scaffold/master.toml
index 363493db3..78a5a6b7c 100644
--- a/weed/command/scaffold/master.toml
+++ b/weed/command/scaffold/master.toml
@@ -14,6 +14,7 @@ scripts = """
volume.deleteEmpty -quietFor=24h -force
volume.balance -force
volume.fix.replication
+ s3.clean.uploads -timeAgo=24h
unlock
"""
sleep_minutes = 17 # sleep minutes between each script execution
diff --git a/weed/server/master_server.go b/weed/server/master_server.go
index d2286dfbf..2b47fda11 100644
--- a/weed/server/master_server.go
+++ b/weed/server/master_server.go
@@ -2,8 +2,6 @@ package weed_server
import (
"fmt"
- "github.com/chrislusf/seaweedfs/weed/cluster"
- "github.com/chrislusf/seaweedfs/weed/pb"
"net/http"
"net/http/httputil"
"net/url"
@@ -13,6 +11,9 @@ import (
"sync"
"time"
+ "github.com/chrislusf/seaweedfs/weed/cluster"
+ "github.com/chrislusf/seaweedfs/weed/pb"
+
"github.com/chrislusf/raft"
"github.com/gorilla/mux"
"google.golang.org/grpc"
@@ -210,10 +211,20 @@ func (ms *MasterServer) startAdminScripts() {
v := util.GetViper()
adminScripts := v.GetString("master.maintenance.scripts")
- glog.V(0).Infof("adminScripts:\n%v", adminScripts)
if adminScripts == "" {
- return
+ adminScripts = `
+ lock
+ ec.encode -fullPercent=95 -quietFor=1h
+ ec.rebuild -force
+ ec.balance -force
+ volume.deleteEmpty -quietFor=24h -force
+ volume.balance -force
+ volume.fix.replication
+ s3.clean.uploads -timeAgo=24h
+ unlock
+ `
}
+ glog.V(0).Infof("adminScripts: %v", adminScripts)
v.SetDefault("master.maintenance.sleep_minutes", 17)
sleepMinutes := v.GetInt("master.maintenance.sleep_minutes")