diff options
Diffstat (limited to 'weed/shell')
| -rw-r--r-- | weed/shell/command_ec_common.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_fs_merge_volumes.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_fs_verify.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_volume_balance.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_volume_check_disk.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_volume_fix_replication.go | 6 | ||||
| -rw-r--r-- | weed/shell/command_volume_list.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_volume_server_evacuate.go | 2 | ||||
| -rw-r--r-- | weed/shell/shell_liner.go | 2 |
9 files changed, 10 insertions, 12 deletions
diff --git a/weed/shell/command_ec_common.go b/weed/shell/command_ec_common.go index e4629905e..0e9062d23 100644 --- a/weed/shell/command_ec_common.go +++ b/weed/shell/command_ec_common.go @@ -18,8 +18,8 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/super_block" "github.com/seaweedfs/seaweedfs/weed/storage/types" - "golang.org/x/exp/slices" "google.golang.org/grpc" + "slices" ) type DataCenterId string diff --git a/weed/shell/command_fs_merge_volumes.go b/weed/shell/command_fs_merge_volumes.go index d35f63c0a..3037480c1 100644 --- a/weed/shell/command_fs_merge_volumes.go +++ b/weed/shell/command_fs_merge_volumes.go @@ -13,7 +13,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/wdclient" "golang.org/x/exp/maps" - "golang.org/x/exp/slices" + "slices" "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" diff --git a/weed/shell/command_fs_verify.go b/weed/shell/command_fs_verify.go index 2cd7f06dc..dcac60874 100644 --- a/weed/shell/command_fs_verify.go +++ b/weed/shell/command_fs_verify.go @@ -20,7 +20,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage" "github.com/seaweedfs/seaweedfs/weed/util" "go.uber.org/atomic" - "golang.org/x/exp/slices" + "slices" ) func init() { diff --git a/weed/shell/command_volume_balance.go b/weed/shell/command_volume_balance.go index 7b2fc7472..48825c616 100644 --- a/weed/shell/command_volume_balance.go +++ b/weed/shell/command_volume_balance.go @@ -13,7 +13,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding" "github.com/seaweedfs/seaweedfs/weed/storage/super_block" "github.com/seaweedfs/seaweedfs/weed/storage/types" - "golang.org/x/exp/slices" + "slices" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/storage/needle" diff --git a/weed/shell/command_volume_check_disk.go b/weed/shell/command_volume_check_disk.go index f72dff243..06154b92b 100644 --- a/weed/shell/command_volume_check_disk.go +++ b/weed/shell/command_volume_check_disk.go @@ -17,8 +17,8 @@ import ( "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" "github.com/seaweedfs/seaweedfs/weed/server/constants" "github.com/seaweedfs/seaweedfs/weed/storage/needle_map" - "golang.org/x/exp/slices" "google.golang.org/grpc" + "slices" ) func init() { diff --git a/weed/shell/command_volume_fix_replication.go b/weed/shell/command_volume_fix_replication.go index 0b9ed09b7..f664ccbb2 100644 --- a/weed/shell/command_volume_fix_replication.go +++ b/weed/shell/command_volume_fix_replication.go @@ -13,10 +13,8 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/needle_map" "github.com/seaweedfs/seaweedfs/weed/storage/types" - "github.com/seaweedfs/seaweedfs/weed/util" - - "golang.org/x/exp/slices" "google.golang.org/grpc" + "slices" "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" @@ -346,7 +344,7 @@ func (c *commandVolumeFixReplication) fixOneUnderReplicatedVolume(commandEnv *Co } } if resp.ProcessedBytes > 0 { - fmt.Fprintf(writer, "volume %d processed %s bytes\n", replica.info.Id, util.BytesToHumanReadable(uint64(resp.ProcessedBytes))) + fmt.Fprintf(writer, "volume %d processed %d bytes\n", replica.info.Id, resp.ProcessedBytes) } } diff --git a/weed/shell/command_volume_list.go b/weed/shell/command_volume_list.go index 3b11bf100..99fd1420b 100644 --- a/weed/shell/command_volume_list.go +++ b/weed/shell/command_volume_list.go @@ -7,8 +7,8 @@ import ( "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding" "github.com/seaweedfs/seaweedfs/weed/storage/types" - "golang.org/x/exp/slices" "path/filepath" + "slices" "strings" "time" diff --git a/weed/shell/command_volume_server_evacuate.go b/weed/shell/command_volume_server_evacuate.go index 5c7c903de..8f7b81003 100644 --- a/weed/shell/command_volume_server_evacuate.go +++ b/weed/shell/command_volume_server_evacuate.go @@ -11,7 +11,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/super_block" "github.com/seaweedfs/seaweedfs/weed/storage/types" - "golang.org/x/exp/slices" + "slices" ) func init() { diff --git a/weed/shell/shell_liner.go b/weed/shell/shell_liner.go index 407dce006..1a4cabad8 100644 --- a/weed/shell/shell_liner.go +++ b/weed/shell/shell_liner.go @@ -8,12 +8,12 @@ import ( "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/util" "github.com/seaweedfs/seaweedfs/weed/util/grace" - "golang.org/x/exp/slices" "io" "math/rand" "os" "path" "regexp" + "slices" "strings" "github.com/peterh/liner" |