diff --git a/datanode/server.go b/datanode/server.go index e8a2a2c17..e6be3c5df 100644 --- a/datanode/server.go +++ b/datanode/server.go @@ -681,7 +681,7 @@ func (s *DataNode) register(cfg *config.Config) (err error) { if settingsForbidFromMaster, err = MasterClient.AdminAPI().GetUpgradeCompatibleSettings(); err != nil { if strings.Contains(err.Error(), proto.KeyWordInHttpApiNotSupportErr) { // master may be lower version and has no this API - volsForbidWriteOpVerMsg = fmt.Sprintf("[registerToMaster] master version has no api GetUpgradeCompatibleSettings, ues default value(false)") + volsForbidWriteOpVerMsg = fmt.Sprintf("[registerToMaster] master version has no api GetUpgradeCompatibleSettings, ues default value") } else { log.LogErrorf("[registerToMaster] GetUpgradeCompatibleSettings from master(%v) err: %v", MasterClient.Leader(), err) diff --git a/datanode/space_manager.go b/datanode/space_manager.go index 7d99e5fa2..4a965fbd2 100644 --- a/datanode/space_manager.go +++ b/datanode/space_manager.go @@ -625,7 +625,7 @@ func (s *DataNode) buildHeartBeatResponse(response *proto.DataNodeHeartbeatRespo } newVal := partition.IsForbidWriteOpOfProtoVer0() if oldVal != newVal { - log.LogInfof("[Heartbeats] vol(%v) dpId(%v) IsForbidWriteOpOfProtoVer0 change to %v", + log.LogWarnf("[Heartbeats] vol(%v) dpId(%v) IsForbidWriteOpOfProtoVer0 change to %v", partition.volumeID, partition.partitionID, newVal) } diff --git a/depends/tiglabs/raft/raft.go b/depends/tiglabs/raft/raft.go index acbb4ba87..adc7dd8a0 100644 --- a/depends/tiglabs/raft/raft.go +++ b/depends/tiglabs/raft/raft.go @@ -22,8 +22,6 @@ import ( "sync/atomic" "unsafe" - "github.com/cubefs/cubefs/util/log" - "github.com/cubefs/cubefs/depends/tiglabs/raft/logger" "github.com/cubefs/cubefs/depends/tiglabs/raft/proto" "github.com/cubefs/cubefs/depends/tiglabs/raft/util" diff --git a/master/gapi_cluster.go b/master/gapi_cluster.go index 303c3377b..db5cfd8ca 100644 --- a/master/gapi_cluster.go +++ b/master/gapi_cluster.go @@ -300,14 +300,18 @@ func (m *ClusterService) getTopology(ctx context.Context, args struct{}) (*proto cv.NodeSet[ns.ID] = nsView ns.dataNodes.Range(func(key, value interface{}) bool { dataNode := value.(*DataNode) - nsView.DataNodes = append(nsView.DataNodes, proto.NodeView{ID: dataNode.ID, Addr: dataNode.Addr, - Status: dataNode.isActive, IsWritable: dataNode.IsWriteAble(), MediaType: dataNode.MediaType}) + nsView.DataNodes = append(nsView.DataNodes, proto.NodeView{ + ID: dataNode.ID, Addr: dataNode.Addr, + Status: dataNode.isActive, IsWritable: dataNode.IsWriteAble(), MediaType: dataNode.MediaType, + }) return true }) ns.metaNodes.Range(func(key, value interface{}) bool { metaNode := value.(*MetaNode) - nsView.MetaNodes = append(nsView.MetaNodes, proto.NodeView{ID: metaNode.ID, Addr: metaNode.Addr, - Status: metaNode.IsActive, IsWritable: metaNode.IsWriteAble(), MediaType: proto.MediaType_Unspecified}) + nsView.MetaNodes = append(nsView.MetaNodes, proto.NodeView{ + ID: metaNode.ID, Addr: metaNode.Addr, + Status: metaNode.IsActive, IsWritable: metaNode.IsWriteAble(), MediaType: proto.MediaType_Unspecified, + }) return true }) } diff --git a/metanode/manager_op.go b/metanode/manager_op.go index 71a00822f..179d24b9f 100644 --- a/metanode/manager_op.go +++ b/metanode/manager_op.go @@ -60,7 +60,7 @@ func (m *metadataManager) checkVolForbidWriteOpOfProtoVer0(partition MetaPartiti } newVal := partition.IsForbidWriteOpOfProtoVer0() if oldVal != newVal { - log.LogInfof("[checkVolForbidWriteOpOfProtoVer0] vol(%v) mpId(%v) IsForbidWriteOpOfProtoVer0 change to %v", + log.LogWarnf("[checkVolForbidWriteOpOfProtoVer0] vol(%v) mpId(%v) IsForbidWriteOpOfProtoVer0 change to %v", mpVolName, partition.GetBaseConfig().PartitionId, newVal) } return diff --git a/metanode/metanode.go b/metanode/metanode.go index 9cccea6bd..796774351 100644 --- a/metanode/metanode.go +++ b/metanode/metanode.go @@ -482,7 +482,7 @@ func (m *MetaNode) register() (err error) { if settingsFromMaster, err = getUpgradeCompatibleSettings(); err != nil { if strings.Contains(err.Error(), proto.KeyWordInHttpApiNotSupportErr) { // master may be lower version and has no this API - volsForbidWriteOpVerMsg = fmt.Sprintf("[register] master version has no api GetUpgradeCompatibleSettings, ues default value(false)") + volsForbidWriteOpVerMsg = fmt.Sprintf("[register] master version has no api GetUpgradeCompatibleSettings, ues default value") } else { log.LogErrorf("[register] tryCnt(%v), GetUpgradeCompatibleSettings from master err: %v", tryCnt, err) time.Sleep(3 * time.Second)