Browse Source

cleaning variables

pull/4321/head
chrislu 2 years ago
parent
commit
50dc2fe96b
  1. 6
      weed/shell/command_fs_verify.go
  2. 3
      weed/shell/command_volume_server_evacuate.go

6
weed/shell/command_fs_verify.go

@ -69,6 +69,12 @@ func (c *commandFsVerify) Do(args []string, commandEnv *CommandEnv, writer io.Wr
c.volumeIds = make(map[uint32][]pb.ServerAddress) c.volumeIds = make(map[uint32][]pb.ServerAddress)
c.waitChan = make(map[string]chan struct{}) c.waitChan = make(map[string]chan struct{})
c.volumeServers = []pb.ServerAddress{} c.volumeServers = []pb.ServerAddress{}
defer func() {
c.modifyTimeAgoAtSec = 0
c.volumeIds = nil
c.waitChan = nil
c.volumeServers = nil
}()
if err := c.collectVolumeIds(); err != nil { if err := c.collectVolumeIds(); err != nil {
return parseErr return parseErr

3
weed/shell/command_volume_server_evacuate.go

@ -88,6 +88,9 @@ func (c *commandVolumeServerEvacuate) volumeServerEvacuate(commandEnv *CommandEn
if err != nil { if err != nil {
return err return err
} }
defer func() {
c.topologyInfo = nil
}()
if err := c.evacuateNormalVolumes(commandEnv, volumeServer, skipNonMoveable, applyChange, writer); err != nil { if err := c.evacuateNormalVolumes(commandEnv, volumeServer, skipNonMoveable, applyChange, writer); err != nil {
return err return err

Loading…
Cancel
Save