diff --git a/master/data_partition_check.go b/master/data_partition_check.go index 96a4205c0..068a518cc 100644 --- a/master/data_partition_check.go +++ b/master/data_partition_check.go @@ -170,7 +170,7 @@ func (partition *DataPartition) checkMissingReplicas(clusterID, leaderAddr strin WarnMetrics.dpMissingReplicaMutex.Unlock() for _, replica := range partition.Replicas { - if partition.hasHost(replica.Addr) && replica.isMissing(dataPartitionMissSec) && !partition.IsDiscard { + if partition.hasHost(replica.Addr) && replica.isMissing(dataPartitionMissSec) { if partition.needToAlarmMissingDataPartition(replica.Addr, dataPartitionWarnInterval) { dataNode := replica.getReplicaNode() var lastReportTime time.Time @@ -219,7 +219,7 @@ func (partition *DataPartition) checkMissingReplicas(clusterID, leaderAddr strin } for _, addr := range partition.Hosts { - if partition.hasMissingDataPartition(addr) && partition.needToAlarmMissingDataPartition(addr, dataPartitionWarnInterval) && !partition.IsDiscard { + if partition.hasMissingDataPartition(addr) && partition.needToAlarmMissingDataPartition(addr, dataPartitionWarnInterval) { msg := fmt.Sprintf("action[checkMissErr],clusterID[%v] partitionID:%v on node:%v "+ "miss time > :%v but server not exsit So Migrate", clusterID, partition.PartitionID, addr, dataPartitionMissSec) msg = msg + fmt.Sprintf(" decommissionDataPartitionURL is http://%v/dataPartition/decommission?id=%v&addr=%v", leaderAddr, partition.PartitionID, addr) diff --git a/master/vol.go b/master/vol.go index 5af6d7a69..2a152d352 100644 --- a/master/vol.go +++ b/master/vol.go @@ -763,6 +763,10 @@ func (vol *Vol) checkDataPartitions(c *Cluster) (cnt int) { }() for _, dp := range partitions { + if dp.IsDiscard { + continue + } + statByMedia[dp.MediaType] += dp.getMaxUsedSpace() if proto.IsPreLoadDp(dp.PartitionType) {