diff --git a/weed/shell/command_ec_decode.go b/weed/shell/command_ec_decode.go index 0aca9e00b..aecc21065 100644 --- a/weed/shell/command_ec_decode.go +++ b/weed/shell/command_ec_decode.go @@ -4,7 +4,6 @@ import ( "context" "flag" "fmt" - "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/storage/types" "io" @@ -39,14 +38,12 @@ func (c *commandEcDecode) Help() string { } func (c *commandEcDecode) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) { - encodeCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError) - volumeId := encodeCommand.Int("volumeId", 0, "the volume id") - collection := encodeCommand.String("collection", "", "the collection name") - forceChanges := encodeCommand.Bool("force", false, "force the encoding even if the cluster has less than recommended 4 nodes") - if err = encodeCommand.Parse(args); err != nil { + decodeCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError) + volumeId := decodeCommand.Int("volumeId", 0, "the volume id") + collection := decodeCommand.String("collection", "", "the collection name") + if err = decodeCommand.Parse(args); err != nil { return nil } - infoAboutSimulationMode(writer, *forceChanges, "-force") if err = commandEnv.confirmIsLocked(args); err != nil { return @@ -60,17 +57,6 @@ func (c *commandEcDecode) Do(args []string, commandEnv *CommandEnv, writer io.Wr return err } - if !*forceChanges { - var nodeCount int - eachDataNode(topologyInfo, func(dc string, rack RackId, dn *master_pb.DataNodeInfo) { - nodeCount++ - }) - if nodeCount < erasure_coding.ParityShardsCount { - glog.V(0).Infof("skip erasure coding with %d nodes, less than recommended %d nodes", nodeCount, erasure_coding.ParityShardsCount) - return nil - } - } - // volumeId is provided if vid != 0 { return doEcDecode(commandEnv, topologyInfo, *collection, vid) diff --git a/weed/shell/command_ec_encode.go b/weed/shell/command_ec_encode.go index 9fe7ad8e4..8864265a7 100644 --- a/weed/shell/command_ec_encode.go +++ b/weed/shell/command_ec_encode.go @@ -4,6 +4,7 @@ import ( "context" "flag" "fmt" + "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb" "io" "math/rand" @@ -62,6 +63,7 @@ func (c *commandEcEncode) Do(args []string, commandEnv *CommandEnv, writer io.Wr fullPercentage := encodeCommand.Float64("fullPercent", 95, "the volume reaches the percentage of max volume size") quietPeriod := encodeCommand.Duration("quietFor", time.Hour, "select volumes without no writes for this period") parallelCopy := encodeCommand.Bool("parallelCopy", true, "copy shards in parallel") + forceChanges := encodeCommand.Bool("force", false, "force the encoding even if the cluster has less than recommended 4 nodes") if err = encodeCommand.Parse(args); err != nil { return nil } @@ -70,6 +72,23 @@ func (c *commandEcEncode) Do(args []string, commandEnv *CommandEnv, writer io.Wr return } + // collect topology information + topologyInfo, _, err := collectTopologyInfo(commandEnv, 0) + if err != nil { + return err + } + + if !*forceChanges { + var nodeCount int + eachDataNode(topologyInfo, func(dc string, rack RackId, dn *master_pb.DataNodeInfo) { + nodeCount++ + }) + if nodeCount < erasure_coding.ParityShardsCount { + glog.V(0).Infof("skip erasure coding with %d nodes, less than recommended %d nodes", nodeCount, erasure_coding.ParityShardsCount) + return nil + } + } + vid := needle.VolumeId(*volumeId) // volumeId is provided