Merge branch 'master' into add_remote_storage

weed/shell/command_volume_fix_replication.go

@@ -195,6 +195,8 @@ func (c *commandVolumeFixReplication) fixOneUnderReplicatedVolume(commandEnv *Co
 			fmt.Fprintf(writer, "replicating volume %d %s from %s to dataNode %s ...\n", replica.info.Id, replicaPlacement, replica.location.dataNode.Id, dst.dataNode.Id)
 
 			if !takeAction {
+				// adjust free volume count
+				dst.dataNode.DiskInfos[replica.info.DiskType].FreeVolumeCount--
 				break
 			}
 

weed/shell/command_volume_tier_move.go

@@ -122,6 +122,8 @@ func doVolumeTierMove(commandEnv *CommandEnv, writer io.Writer, vid needle.Volum
 			hasFoundTarget = true
 
 			if !applyChanges {
+				// adjust volume count
+				dst.dataNode.DiskInfos[string(toDiskType)].VolumeCount++
 				break
 			}
 
@@ -133,6 +135,9 @@ func doVolumeTierMove(commandEnv *CommandEnv, writer io.Writer, vid needle.Volum
 				return fmt.Errorf("move volume %d %s => %s : %v", vid, locations[0].Url, dst.dataNode.Id, err)
 			}
 
+			// adjust volume count
+			dst.dataNode.DiskInfos[string(toDiskType)].VolumeCount++
+
 			// remove the remaining replicas
 			for _, loc := range locations {
 				if loc.Url != dst.dataNode.Id {