mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-15 00:09:00 +01:00
* shell: return flag parse errors from every command 48 commands returned nil when their flags failed to parse, so a mistyped flag printed the flag error but the command still counted as a success: a piped weed shell run exited 0, the master maintenance loop logged no error, and admin script jobs reported the line as done. Return the parse error as s3.bucket.create (#12544) and the other shell commands already do. TestCommandsReturnFlagParseErrors runs every registered command with an unknown flag and fails for the 48 on master. Signed-off-by: anant <170962632+antcybersec@users.noreply.github.com> * shell: don't report -h as a failure With the parse errors returned, -h on those commands now returns flag.ErrHelp, so the shell printed "error: flag: help requested" and a piped run exited 1. The flag package has already printed the usage, so processEachCmd now treats flag.ErrHelp as success for every command. Signed-off-by: anant <170962632+antcybersec@users.noreply.github.com> * shell: keep the -h test beside the flag parse test TestProcessEachCmdTreatsHelpAsSuccess covers the same change as TestCommandsReturnFlagParseErrors, so it lives in the same new file and shell_liner_test.go stays as it was. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Signed-off-by: anant <170962632+antcybersec@users.noreply.github.com> Co-authored-by: anant <170962632+antcybersec@users.noreply.github.com> Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
123 lines
3.5 KiB
Go
123 lines
3.5 KiB
Go
package shell
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"math"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/filer"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandS3BucketQuotaEnforce{})
|
|
}
|
|
|
|
type commandS3BucketQuotaEnforce struct {
|
|
}
|
|
|
|
func (c *commandS3BucketQuotaEnforce) Name() string {
|
|
return "s3.bucket.quota.enforce"
|
|
}
|
|
|
|
func (c *commandS3BucketQuotaEnforce) Help() string {
|
|
return `check quota for all buckets, make the bucket read only if over the limit
|
|
|
|
Example:
|
|
s3.bucket.quota.enforce -apply
|
|
`
|
|
}
|
|
|
|
func (c *commandS3BucketQuotaEnforce) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandS3BucketQuotaEnforce) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
|
|
|
|
bucketCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
applyQuotaLimit := bucketCommand.Bool("apply", false, "actually change the buckets readonly attribute")
|
|
if err = bucketCommand.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
infoAboutSimulationMode(writer, *applyQuotaLimit, "-apply")
|
|
|
|
// collect collection information
|
|
topologyInfo, _, err := collectTopologyInfo(commandEnv, 0)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
collectionInfos := make(map[string]*CollectionInfo)
|
|
collectCollectionInfo(topologyInfo, collectionInfos)
|
|
|
|
// read buckets path
|
|
var filerBucketsPath string
|
|
filerBucketsPath, err = readFilerBucketsPath(commandEnv)
|
|
if err != nil {
|
|
return fmt.Errorf("read buckets: %w", err)
|
|
}
|
|
|
|
// read existing filer configuration
|
|
fc, err := filer.ReadFilerConf(commandEnv.FilerAddress(), commandEnv.option.GrpcDialOption, commandEnv.MasterClient)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// process each bucket
|
|
hasConfChanges := false
|
|
err = filer_pb.List(context.Background(), commandEnv, filerBucketsPath, "", func(entry *filer_pb.Entry, isLast bool) error {
|
|
if !entry.IsDirectory {
|
|
return nil
|
|
}
|
|
collection := getCollectionName(commandEnv, entry.Name)
|
|
var collectionSize float64
|
|
if collectionInfo, found := collectionInfos[collection]; found {
|
|
collectionSize = collectionInfo.LogicalSize()
|
|
}
|
|
if c.processEachBucket(fc, filerBucketsPath, entry, writer, collectionSize) {
|
|
hasConfChanges = true
|
|
}
|
|
return nil
|
|
}, "", false, math.MaxUint32)
|
|
if err != nil {
|
|
return fmt.Errorf("list buckets under %v: %w", filerBucketsPath, err)
|
|
}
|
|
|
|
// apply the configuration changes
|
|
if hasConfChanges && *applyQuotaLimit {
|
|
|
|
var buf2 bytes.Buffer
|
|
fc.ToText(&buf2)
|
|
|
|
if err = commandEnv.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
|
|
return filer.SaveInsideFiler(context.Background(), client, filer.DirectoryEtcSeaweedFS, filer.FilerConfName, buf2.Bytes())
|
|
}); err != nil && err != filer_pb.ErrNotFound {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
func (c *commandS3BucketQuotaEnforce) processEachBucket(fc *filer.FilerConf, filerBucketsPath string, entry *filer_pb.Entry, writer io.Writer, collectionSize float64) (hasConfChanges bool) {
|
|
|
|
locPrefix := filerBucketsPath + "/" + entry.Name + "/"
|
|
|
|
readOnly, hasConfChanges := fc.ApplyBucketQuotaReadOnly(locPrefix, collectionSize, float64(entry.Quota))
|
|
if hasConfChanges {
|
|
fmt.Fprintf(writer, " %s\tsize:%.0f", entry.Name, collectionSize)
|
|
fmt.Fprintf(writer, "\tquota:%d\tusage:%.2f%%", entry.Quota, collectionSize*100/float64(entry.Quota))
|
|
fmt.Fprintln(writer)
|
|
if readOnly {
|
|
fmt.Fprintf(writer, " changing bucket %s to read only!\n", entry.Name)
|
|
} else {
|
|
fmt.Fprintf(writer, " changing bucket %s to writable.\n", entry.Name)
|
|
}
|
|
}
|
|
|
|
return
|
|
}
|