mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-05 19:47:47 +01:00
ec: expose force_deleted_needles_check in ScrubEcVolume RPC and shell (#10176)
* ec: expose force_deleted_needles_check in ScrubEcVolume RPC and shell FULL EC scrubs can opt into strict deleted-needle verification via the -forceDeletedNeedlesCheck shell flag, off by default since it can report false positives when EC indexes disagree. Rejected for non-FULL modes. The Rust volume server parses the new field and ignores it: its FULL scrub verifies shards via RS parity, not per-needle reads. * volume: require admin auth for ScrubEcVolume ScrubEcVolume ran unauthenticated while its sibling ScrubVolume, and the rest of the mutating volume handlers, gate on checkGrpcAdminAuth. Close the gap so an EC scrub can't be triggered anonymously. * shell: reject ec.scrub -forceDeletedNeedlesCheck outside full mode Fail in the client before fanning out to every volume server, instead of erroring halfway through once the servers reject the request.
This commit is contained in:
1 parent
b872d5e683
commit
05b4b5bf56
5 files changed
+38
-14
No files matched your search
@@ -20,11 +20,12 @@ func init() {
|
||||
}
|
||||
|
||||
type commandEcVolumeScrub struct {
|
||||
env *CommandEnv
|
||||
volumeServerAddrs []pb.ServerAddress
|
||||
volumeIDs []uint32
|
||||
mode volume_server_pb.VolumeScrubMode
|
||||
grpcDialOption grpc.DialOption
|
||||
env *CommandEnv
|
||||
volumeServerAddrs []pb.ServerAddress
|
||||
volumeIDs []uint32
|
||||
mode volume_server_pb.VolumeScrubMode
|
||||
forceDeletedNeedlesCheck bool
|
||||
grpcDialOption grpc.DialOption
|
||||
}
|
||||
|
||||
func (c *commandEcVolumeScrub) Name() string {
|
||||
@@ -52,6 +53,7 @@ func (c *commandEcVolumeScrub) Do(args []string, commandEnv *CommandEnv, writer
|
||||
mode := volScrubCommand.String("mode", "local", "scrubbing mode (index/local/full/checksum)")
|
||||
maxParallelization := volScrubCommand.Int("maxParallelization", DefaultMaxParallelization, "run up to X tasks in parallel, whenever possible")
|
||||
showDetails := volScrubCommand.Bool("details", false, "display scrub result details, if available")
|
||||
forceDeletedNeedlesCheck := volScrubCommand.Bool("forceDeletedNeedlesCheck", false, "force strict verification of deleted needles (full mode only); may report false positives when EC indexes disagree")
|
||||
|
||||
if err = volScrubCommand.Parse(args); err != nil {
|
||||
return err
|
||||
@@ -104,6 +106,10 @@ func (c *commandEcVolumeScrub) Do(args []string, commandEnv *CommandEnv, writer
|
||||
}
|
||||
fmt.Fprintf(writer, "using %s mode\n", c.mode.String())
|
||||
c.env = commandEnv
|
||||
c.forceDeletedNeedlesCheck = *forceDeletedNeedlesCheck
|
||||
if c.forceDeletedNeedlesCheck && c.mode != volume_server_pb.VolumeScrubMode_FULL {
|
||||
return fmt.Errorf("deleted needle checks are only supported for FULL scrubs")
|
||||
}
|
||||
|
||||
return c.scrubEcVolumes(writer, *maxParallelization, *showDetails)
|
||||
}
|
||||
@@ -125,8 +131,9 @@ func (c *commandEcVolumeScrub) scrubEcVolumes(writer io.Writer, maxParallelizati
|
||||
|
||||
err := operation.WithVolumeServerClient(false, addr, c.env.option.GrpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error {
|
||||
res, err := volumeServerClient.ScrubEcVolume(context.Background(), &volume_server_pb.ScrubEcVolumeRequest{
|
||||
Mode: c.mode,
|
||||
VolumeIds: c.volumeIDs,
|
||||
Mode: c.mode,
|
||||
VolumeIds: c.volumeIDs,
|
||||
ForceDeletedNeedlesCheck: c.forceDeletedNeedlesCheck,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
Reference in new issue
Block a user