Refactoring: sdk When creating a datapartition, select the datapartit…

…ion retry strategy and go fmt project Signed-off-by: awzhgw <[email protected]>
shijiesun · Aug 16, 2019 · 2265785 · 2265785
1 parent b0d82fb
commit 2265785
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/datanode/disk.go b/datanode/disk.go
@@ -141,7 +141,7 @@ func (d *Disk) incWriteErrCnt() {
 func (d *Disk) startScheduleToUpdateSpaceInfo() {
 	go func() {
 		updateSpaceInfoTicker := time.NewTicker(5 * time.Second)
-		checkStatusTickser :=time.NewTicker(time.Minute*2)
+		checkStatusTickser := time.NewTicker(time.Minute * 2)
 		defer func() {
 			updateSpaceInfoTicker.Stop()
 			checkStatusTickser.Stop()
@@ -159,38 +159,38 @@ func (d *Disk) startScheduleToUpdateSpaceInfo() {
 }
 
 const (
-	DiskStatusFile=".diskStatus"
+	DiskStatusFile = ".diskStatus"
 )
 
-func (d *Disk)checkDiskStatus(){
-	path:=path.Join(d.Path,DiskStatusFile)
-	fp,err:=os.OpenFile(path,os.O_CREATE|os.O_TRUNC|os.O_RDWR,0755)
-	if err!=nil {
+func (d *Disk) checkDiskStatus() {
+	path := path.Join(d.Path, DiskStatusFile)
+	fp, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0755)
+	if err != nil {
 		d.triggerDiskError(err)
 		return
 	}
 	defer fp.Close()
-	data:=[]byte(DiskStatusFile)
-	_,err=fp.WriteAt(data,0)
-	if err!=nil {
+	data := []byte(DiskStatusFile)
+	_, err = fp.WriteAt(data, 0)
+	if err != nil {
 		d.triggerDiskError(err)
 		return
 	}
-	if err=fp.Sync();err!=nil {
+	if err = fp.Sync(); err != nil {
 		d.triggerDiskError(err)
 		return
 	}
-	if _,err=fp.ReadAt(data,0);err!=nil {
+	if _, err = fp.ReadAt(data, 0); err != nil {
 		d.triggerDiskError(err)
 		return
 	}
 }
 
-func (d *Disk)triggerDiskError(err error){
-	if err==nil {
+func (d *Disk) triggerDiskError(err error) {
+	if err == nil {
 		return
 	}
-	if IsDiskErr(err.Error()){
+	if IsDiskErr(err.Error()) {
 		mesg := fmt.Sprintf("disk path %v error on %v", d.Path, LocalIP)
 		exporter.Warning(mesg)
 		log.LogErrorf(mesg)

diff --git a/datanode/server.go b/datanode/server.go
@@ -329,9 +329,9 @@ func (s *DataNode) checkLocalPartitionMatchWithMaster() (err error) {
 		}
 		break
 	}
-	dinfo:=new(DataNodeInfo)
-	if err = json.Unmarshal(data.([]byte),dinfo);err!=nil {
-		err=fmt.Errorf("checkLocalPartitionMatchWithMaster jsonUnmarsh failed %v",err)
+	dinfo := new(DataNodeInfo)
+	if err = json.Unmarshal(data.([]byte), dinfo); err != nil {
+		err = fmt.Errorf("checkLocalPartitionMatchWithMaster jsonUnmarsh failed %v", err)
 		log.LogErrorf(err.Error())
 		return
 	}

diff --git a/metanode/metanode.go b/metanode/metanode.go
@@ -108,13 +108,13 @@ func (m *MetaNode) checkLocalPartitionMatchWithMaster() (err error) {
 		break
 	}
 
-	minfo:=new(MetaNodeInfo)
-	if err = json.Unmarshal(data.([]byte),minfo);err!=nil {
-		err=fmt.Errorf("checkLocalPartitionMatchWithMaster jsonUnmarsh failed %v",err)
+	minfo := new(MetaNodeInfo)
+	if err = json.Unmarshal(data.([]byte), minfo); err != nil {
+		err = fmt.Errorf("checkLocalPartitionMatchWithMaster jsonUnmarsh failed %v", err)
 		log.LogErrorf(err.Error())
 		return
 	}
-	
+
 	if len(minfo.PersistenceMetaPartitions) == 0 {
 		return
 	}

diff --git a/storage/extent_store.go b/storage/extent_store.go
@@ -626,8 +626,8 @@ func (s *ExtentStore) RecordTinyDelete(extentID uint64, offset, size, tinyDelete
 
 func (s *ExtentStore) ReadTinyDeleteRecords(offset, size int64, data []byte) (crc uint32, err error) {
 	_, err = s.tinyExtentDeleteFp.ReadAt(data[:size], offset)
-	if err ==nil || err==io.EOF{
-		err=nil
+	if err == nil || err == io.EOF {
+		err = nil
 		crc = crc32.ChecksumIEEE(data[:size])
 	}
 	return

diff --git a/vendor/github.com/tiglabs/raft/raft_fsm.go b/vendor/github.com/tiglabs/raft/raft_fsm.go