Browse Source
admin: seed admin_script plugin config from master maintenance scripts
admin: seed admin_script plugin config from master maintenance scripts
When the admin server starts, fetch the maintenance scripts configuration from the master via GetMasterConfiguration. If the admin_script plugin worker does not already have a saved config, use the master's scripts as the default value. This enables seamless migration from master.toml [master.maintenance] to the admin script plugin worker. Changes: - Add maintenance_scripts and maintenance_sleep_minutes fields to GetMasterConfigurationResponse in master.proto - Populate the new fields from viper config in master_grpc_server.go - On admin server startup, fetch the master config and seed the admin_script plugin config if no config exists yet - Strip lock/unlock commands from the master scripts since the admin script worker handles locking automatically Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>pull/8509/head
7 changed files with 226 additions and 20 deletions
-
110weed/admin/dash/admin_server.go
-
62weed/admin/dash/admin_server_seed_test.go
-
2weed/cluster/maintenance/maintenance_config.go
-
3weed/pb/master.proto
-
42weed/pb/master_pb/master.pb.go
-
25weed/server/master_grpc_server.go
-
2weed/server/master_server.go
@ -0,0 +1,62 @@ |
|||
// MIGRATION: Tests for seedAdminScriptFromMaster. Remove after March 2027.
|
|||
package dash |
|||
|
|||
import "testing" |
|||
|
|||
func TestCleanMaintenanceScript(t *testing.T) { |
|||
tests := []struct { |
|||
name string |
|||
input string |
|||
expected string |
|||
}{ |
|||
{ |
|||
name: "empty", |
|||
input: "", |
|||
expected: "", |
|||
}, |
|||
{ |
|||
name: "only lock unlock", |
|||
input: " lock\n unlock\n", |
|||
expected: "", |
|||
}, |
|||
{ |
|||
name: "strips lock and unlock", |
|||
input: " lock\n ec.balance -apply\n volume.fix.replication -apply\n unlock\n", |
|||
expected: "ec.balance -apply\nvolume.fix.replication -apply", |
|||
}, |
|||
{ |
|||
name: "case insensitive lock", |
|||
input: "Lock\nec.balance -apply\nUNLOCK", |
|||
expected: "ec.balance -apply", |
|||
}, |
|||
{ |
|||
name: "preserves comments removal", |
|||
input: "lock\n# a comment\nec.balance -apply\nunlock", |
|||
expected: "ec.balance -apply", |
|||
}, |
|||
{ |
|||
name: "no lock unlock present", |
|||
input: "ec.balance -apply\nvolume.fix.replication -apply", |
|||
expected: "ec.balance -apply\nvolume.fix.replication -apply", |
|||
}, |
|||
{ |
|||
name: "windows line endings", |
|||
input: "lock\r\nec.balance -apply\r\nunlock\r\n", |
|||
expected: "ec.balance -apply", |
|||
}, |
|||
{ |
|||
name: "typical master default", |
|||
input: "\n lock\n ec.encode -fullPercent=95 -quietFor=1h\n ec.rebuild -apply\n ec.balance -apply\n fs.log.purge -daysAgo=7\n volume.deleteEmpty -quietFor=24h -apply\n volume.balance -apply\n volume.fix.replication -apply\n s3.clean.uploads -timeAgo=24h\n unlock\n", |
|||
expected: "ec.encode -fullPercent=95 -quietFor=1h\nec.rebuild -apply\nec.balance -apply\nfs.log.purge -daysAgo=7\nvolume.deleteEmpty -quietFor=24h -apply\nvolume.balance -apply\nvolume.fix.replication -apply\ns3.clean.uploads -timeAgo=24h", |
|||
}, |
|||
} |
|||
|
|||
for _, tt := range tests { |
|||
t.Run(tt.name, func(t *testing.T) { |
|||
got := cleanMaintenanceScript(tt.input) |
|||
if got != tt.expected { |
|||
t.Errorf("cleanMaintenanceScript(%q) = %q, want %q", tt.input, got, tt.expected) |
|||
} |
|||
}) |
|||
} |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue