diff --git a/master/data_node.go b/master/data_node.go index 7a5f6aafd..22526769e 100644 --- a/master/data_node.go +++ b/master/data_node.go @@ -280,9 +280,12 @@ func (dataNode *DataNode) canAllocDp() bool { return false } - if cnt := dataNode.availableDiskCount(); cnt == 0 { - log.LogWarnf("action[canAllocDp] dataNode [%v] availableDiskCount is 0 ", dataNode.Addr) - return false + // compatible with 3.4.0 before + if len(dataNode.AllDisks) != 0 { + if cnt := dataNode.availableDiskCount(); cnt == 0 { + log.LogWarnf("action[canAllocDp] dataNode [%v] availableDiskCount is 0 ", dataNode.Addr) + return false + } } if !dataNode.PartitionCntLimited() { diff --git a/master/monitor_metrics.go b/master/monitor_metrics.go index 0f781a852..847cb46e7 100644 --- a/master/monitor_metrics.go +++ b/master/monitor_metrics.go @@ -699,8 +699,8 @@ func (mm *monitorMetrics) setVolMetrics() { mm.volNames[volName] = struct{}{} delete(deleteVolNames, volName) - mm.volTotalSpace.SetWithLabelValues(float64(volStatInfo.TotalSize)/float64(util.GB), volName) - mm.volUsedSpace.SetWithLabelValues(float64(volStatInfo.UsedSize)/float64(util.GB), volName) + mm.volTotalSpace.SetWithLabelValues(float64(volStatInfo.TotalSize), volName) + mm.volUsedSpace.SetWithLabelValues(float64(volStatInfo.UsedSize), volName) usedRatio, e := strconv.ParseFloat(volStatInfo.UsedRatio, 64) if e == nil { mm.volUsage.SetWithLabelValues(usedRatio, volName) diff --git a/metanode/partition_op_uniq_test.go b/metanode/partition_op_uniq_test.go index a47b93dab..9c91505e4 100644 --- a/metanode/partition_op_uniq_test.go +++ b/metanode/partition_op_uniq_test.go @@ -22,7 +22,7 @@ import ( ) func TestInodeOnce(t *testing.T) { - ino := &InodeOnce{ + ino := &InodeOnceWithVersion{ UniqID: 123, Inode: 456, }