From 63442dc80bcc6885c80c45fac186de02a1870011 Mon Sep 17 00:00:00 2001 From: LHHDZ Date: Sun, 25 Aug 2024 16:26:52 +0800 Subject: [PATCH] revert delete ops Signed-off-by: LHHDZ --- weed/shell/command_collection_delete.go | 2 +- weed/shell/command_fs_mv.go | 2 +- weed/shell/command_fs_rm.go | 2 +- weed/shell/command_s3_bucket_delete.go | 2 +- weed/shell/command_volume_balance_test.go | 2 +- weed/shell/command_volume_delete.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/weed/shell/command_collection_delete.go b/weed/shell/command_collection_delete.go index caf52aa9b..936f35b46 100644 --- a/weed/shell/command_collection_delete.go +++ b/weed/shell/command_collection_delete.go @@ -10,7 +10,7 @@ import ( ) func init() { - //Commands = append(Commands, &commandCollectionDelete{}) + Commands = append(Commands, &commandCollectionDelete{}) } type commandCollectionDelete struct { diff --git a/weed/shell/command_fs_mv.go b/weed/shell/command_fs_mv.go index 73c792efa..8e609edc9 100644 --- a/weed/shell/command_fs_mv.go +++ b/weed/shell/command_fs_mv.go @@ -10,7 +10,7 @@ import ( ) func init() { - //Commands = append(Commands, &commandFsMv{}) + Commands = append(Commands, &commandFsMv{}) } type commandFsMv struct { diff --git a/weed/shell/command_fs_rm.go b/weed/shell/command_fs_rm.go index 2343e91fd..b8445b7e9 100644 --- a/weed/shell/command_fs_rm.go +++ b/weed/shell/command_fs_rm.go @@ -11,7 +11,7 @@ import ( ) func init() { - //Commands = append(Commands, &commandFsRm{}) + Commands = append(Commands, &commandFsRm{}) } type commandFsRm struct { diff --git a/weed/shell/command_s3_bucket_delete.go b/weed/shell/command_s3_bucket_delete.go index 05b020077..3b2a9c6e9 100644 --- a/weed/shell/command_s3_bucket_delete.go +++ b/weed/shell/command_s3_bucket_delete.go @@ -11,7 +11,7 @@ import ( ) func init() { - //Commands = append(Commands, &commandS3BucketDelete{}) + Commands = append(Commands, &commandS3BucketDelete{}) } type commandS3BucketDelete struct { diff --git a/weed/shell/command_volume_balance_test.go b/weed/shell/command_volume_balance_test.go index b2888daea..fb39e063f 100644 --- a/weed/shell/command_volume_balance_test.go +++ b/weed/shell/command_volume_balance_test.go @@ -252,7 +252,7 @@ func TestIsGoodMove(t *testing.T) { func TestBalance(t *testing.T) { topologyInfo := parseOutput(topoData) volumeServers := collectVolumeServersByDc(topologyInfo, "") - volumeReplicas, _ := collectVolumeReplicaLocations(topologyInfo, nil) + volumeReplicas, _ := collectVolumeReplicaLocations(topologyInfo) diskTypes := collectVolumeDiskTypes(topologyInfo) if err := balanceVolumeServers(nil, diskTypes, volumeReplicas, volumeServers, "ALL_COLLECTIONS", false); err != nil { diff --git a/weed/shell/command_volume_delete.go b/weed/shell/command_volume_delete.go index 327db7ca2..159981c93 100644 --- a/weed/shell/command_volume_delete.go +++ b/weed/shell/command_volume_delete.go @@ -9,7 +9,7 @@ import ( ) func init() { - //Commands = append(Commands, &commandVolumeDelete{}) + Commands = append(Commands, &commandVolumeDelete{}) } type commandVolumeDelete struct {