From 8c82c037b9b99b5514010267755745ca19eae8f4 Mon Sep 17 00:00:00 2001 From: Lisandro Pin Date: Tue, 10 Dec 2024 22:30:13 +0100 Subject: Unify the re-balancing logic for `ec.encode` with `ec.balance`. (#6339) Among others, this enables recent changes related to topology aware re-balancing at EC encoding time. --- weed/shell/command_ec_decode.go | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'weed/shell/command_ec_decode.go') diff --git a/weed/shell/command_ec_decode.go b/weed/shell/command_ec_decode.go index d3e985a2f..673a9a4f2 100644 --- a/weed/shell/command_ec_decode.go +++ b/weed/shell/command_ec_decode.go @@ -5,7 +5,6 @@ import ( "flag" "fmt" "io" - "time" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/storage/types" @@ -241,25 +240,6 @@ func lookupVolumeIds(commandEnv *CommandEnv, volumeIds []string) (volumeIdLocati return resp.VolumeIdLocations, nil } -func collectTopologyInfo(commandEnv *CommandEnv, delayBeforeCollecting time.Duration) (topoInfo *master_pb.TopologyInfo, volumeSizeLimitMb uint64, err error) { - - if delayBeforeCollecting > 0 { - time.Sleep(delayBeforeCollecting) - } - - var resp *master_pb.VolumeListResponse - err = commandEnv.MasterClient.WithClient(false, func(client master_pb.SeaweedClient) error { - resp, err = client.VolumeList(context.Background(), &master_pb.VolumeListRequest{}) - return err - }) - if err != nil { - return - } - - return resp.TopologyInfo, resp.VolumeSizeLimitMb, nil - -} - func collectEcShardIds(topoInfo *master_pb.TopologyInfo, selectedCollection string) (vids []needle.VolumeId) { vidMap := make(map[uint32]bool) -- cgit v1.2.3