fix bug: fix test run fail(ByteStorage#149)

.github/workflows/greetings.yml

@@ -12,5 +12,5 @@ jobs:
     - uses: actions/first-interaction@v1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: "Message that will be displayed on users' first issue"
-        pr-message: "Message that will be displayed on users' first pull request"
+        issue-message: "Thank you very much for your issue and we will discuss it."
+        pr-message: "Thank you very much for your contribution, we will promptly review your code if there are no errors and pass ci. We will merge your pull request into the master branch."

cluster/region/region_test.go

@@ -25,8 +25,11 @@ func ReturnNewDB() *engine.DB {
 func destroyRegion(r Region) {
 	// Close the region's database
 	db := r.(*TestRegionStruct).db
-	_ = db.Close()
-	err := os.RemoveAll(dirpath)
+	err := db.Close()
+	if err != nil {
+		return
+	}
+	err = os.RemoveAll(dirpath)
 	if err != nil {
 		return
 	}

config/options.go

@@ -9,6 +9,7 @@ type Options struct {
 	IndexType    IndexerType
 	FIOType      FIOType
 	Addr         string // Addr DB Server Listen
+	IsCli        bool   // Is Cli
 }
 
 // IteratorOptions is the configuration for index iteration.
@@ -57,6 +58,7 @@ var DefaultOptions = Options{
 	IndexType:    ART,
 	FIOType:      MmapIOType,
 	Addr:         DefaultAddr,
+	IsCli:        false,
 }
 
 var DefaultIteratorOptions = IteratorOptions{

engine/batch_test.go

@@ -7,14 +7,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+	"time"
 )
 
 func TestDB_WriteBatch(t *testing.T) {
 	opts := config.DefaultOptions
 	dir, _ := os.MkdirTemp("", "flydb-batch-1")
 	opts.DirPath = dir
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -51,7 +52,7 @@ func TestDB_WriteBatchRestart(t *testing.T) {
 	dir, _ := os.MkdirTemp("", "flydb-batch-2")
 	opts.DirPath = dir
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -77,6 +78,8 @@ func TestDB_WriteBatchRestart(t *testing.T) {
 	assert.Nil(t, err)
 
 	db2, err := NewDB(opts)
+	time.Sleep(time.Millisecond * 100)
+	defer db2.Clean()
 	assert.Nil(t, err)
 
 	_, err = db2.Get(randkv.GetTestKey(1))
@@ -91,6 +94,7 @@ func TestDB_WriteBatch1(t *testing.T) {
 	dir := "/tmp/batch-3"
 	opts.DirPath = dir
 	db, err := NewDB(opts)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 

engine/benchmark/benchmark_test.go

@@ -39,6 +39,7 @@ func init() {
 	opts.DirPath = filepath.Join("benchmark", "flydbtest")
 
 	FlyDB, err = flydb.NewFlyDB(opts)
+	defer FlyDB.Clean()
 	if err != nil {
 		panic(err)
 	}

engine/db.go

@@ -10,16 +10,19 @@ import (
 	"github.com/ByteStorage/FlyDB/lib/const"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/health"
 	"google.golang.org/grpc/health/grpc_health_v1"
 	"io"
 	"net"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
 	"sync"
+	"syscall"
 )
 
 // DB represents a FlyDB database instance,
@@ -102,10 +105,6 @@ func NewDB(options config.Options) (*DB, error) {
 	if err := db.loadIndexFromDataFiles(); err != nil {
 		return nil, err
 	}
-
-	// start grpc server
-	db.startGrpcServer()
-
 	return db, nil
 }
 
@@ -141,8 +140,6 @@ func (db *DB) Close() error {
 			return err
 		}
 	}
-	// close grpc server
-	db.server.Stop()
 	return nil
 }
 
@@ -263,8 +260,8 @@ func (db *DB) setActiveDataFile() error {
 // Get Read data according to the key
 func (db *DB) Get(key []byte) ([]byte, error) {
 	zap.L().Info("get", zap.ByteString("key", key))
-	db.lock.Lock()
-	defer db.lock.Unlock()
+	db.lock.RLock()
+	defer db.lock.RUnlock()
 
 	// Determine the validity of the key
 	if len(key) == 0 {
@@ -556,7 +553,8 @@ func (db *DB) loadIndexFromDataFiles() error {
 	return nil
 }
 
-func (db *DB) startGrpcServer() {
+// StartGrpcServer starts the grpc server
+func (db *DB) StartGrpcServer() {
 	listener, err := net.Listen("tcp", db.options.Addr)
 	if err != nil {
 		panic("tcp listen error: " + err.Error())
@@ -571,5 +569,41 @@ func (db *DB) startGrpcServer() {
 			panic("db server start error: " + err.Error())
 		}
 	}()
+	//wait for server start
+	for {
+		conn, err := grpc.Dial(db.options.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+		if err != nil {
+			continue
+		}
+		err = conn.Close()
+		if err != nil {
+			continue
+		}
+		break
+	}
+	if db.options.IsCli {
+		// graceful shutdown
+		sig := make(chan os.Signal)
+		signal.Notify(sig, syscall.SIGINT, syscall.SIGKILL)
+
+		<-sig
+	}
+}
 
+func (db *DB) StopGrpcServer() {
+	if db.server != nil {
+		db.server.Stop()
+	}
+}
+
+// Clean the DB data directory after the test is complete
+func (db *DB) Clean() {
+	if db != nil {
+		db.StopGrpcServer()
+		_ = db.Close()
+		err := os.RemoveAll(db.options.DirPath)
+		if err != nil {
+			panic(err)
+		}
+	}
 }

engine/db_test.go

@@ -9,27 +9,15 @@ import (
 	"os"
 	"sync"
 	"testing"
+	"time"
 )
 
-// Destroy the DB data directory after the test is complete
-func destroyDB(db *DB) {
-	if db != nil {
-		if db.activeFile != nil {
-			_ = db.Close()
-		}
-		err := os.RemoveAll(db.options.DirPath)
-		if err != nil {
-			panic(err)
-		}
-	}
-}
-
 func TestNewFlyDB(t *testing.T) {
 	opts := config.DefaultOptions
 	dir, _ := os.MkdirTemp("", "flydb")
 	opts.DirPath = dir
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 }
@@ -40,7 +28,7 @@ func TestDB_Put(t *testing.T) {
 	opts.DirPath = dir
 	opts.DataFileSize = 64 * 1024 * 1024
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -82,6 +70,7 @@ func TestDB_Put(t *testing.T) {
 
 	// Restart the database
 	db2, err := NewDB(opts)
+	defer db2.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db2)
 	val4 := randkv.RandomValue(128)
@@ -98,7 +87,7 @@ func TestDB_ConcurrentPut(t *testing.T) {
 	opts.DirPath = dir
 	opts.DataFileSize = 64 * 1024 * 1024
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -177,6 +166,7 @@ func TestDB_ConcurrentPut(t *testing.T) {
 
 	// Restart the database
 	db2, err := NewDB(opts)
+	defer db2.Clean()
 
 	val1, err := db2.Get(randkv.GetTestKey(1))
 	assert.Nil(t, err)
@@ -214,7 +204,7 @@ func TestDB_Get(t *testing.T) {
 	opts.DirPath = dir
 	opts.DataFileSize = 64 * 1024 * 1024
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -263,6 +253,7 @@ func TestDB_Get(t *testing.T) {
 
 	// Restart the database
 	db2, err := NewDB(opts)
+	defer db2.Clean()
 	val6, err := db2.Get(randkv.GetTestKey(11))
 	assert.Nil(t, err)
 	assert.NotNil(t, val6)
@@ -284,7 +275,7 @@ func TestDB_Delete(t *testing.T) {
 	opts.DirPath = dir
 	opts.DataFileSize = 64 * 1024 * 1024
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -322,6 +313,8 @@ func TestDB_Delete(t *testing.T) {
 
 	// Restart the database
 	db2, err := NewDB(opts)
+	time.Sleep(time.Millisecond * 100)
+	defer db2.Clean()
 	_, err = db2.Get(randkv.GetTestKey(11))
 	assert.Equal(t, _const.ErrKeyNotFound, err)
 
@@ -336,7 +329,7 @@ func TestDB_GetListKeys(t *testing.T) {
 	opts.DirPath = dir
 	opts.DataFileSize = 64 * 1024 * 1024
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -370,7 +363,7 @@ func TestDB_Fold(t *testing.T) {
 	opts.DirPath = dir
 	opts.DataFileSize = 64 * 1024 * 1024
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -413,7 +406,7 @@ func TestDB_Sync(t *testing.T) {
 	opts.DirPath = dir
 	opts.DataFileSize = 64 * 1024 * 1024
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 

engine/iterator_test.go

@@ -13,6 +13,7 @@ func TestDB_NewIterator(t *testing.T) {
 	dir, _ := os.MkdirTemp("", "flydb-iterator-1")
 	opt.DirPath = dir
 	db, err := NewDB(opt)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -26,6 +27,7 @@ func TestDB_Iterator_One_Value(t *testing.T) {
 	dir, _ := os.MkdirTemp("", "flydb-iterator-2")
 	opt.DirPath = dir
 	db, err := NewDB(opt)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -45,6 +47,7 @@ func TestDB_Iterator_Multi_Value(t *testing.T) {
 	dir, _ := os.MkdirTemp("", "flydb-iterator-3")
 	opt.DirPath = dir
 	db, err := NewDB(opt)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 

engine/merge_test.go

@@ -14,7 +14,7 @@ func TestDB_Merge(t *testing.T) {
 	dir, _ := os.MkdirTemp("", "flydb-merge-1")
 	opts.DirPath = dir
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -29,7 +29,7 @@ func TestDB_Merge2(t *testing.T) {
 	opts.DataFileSize = 32 * 1024 * 1024
 	opts.DirPath = dir
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 
@@ -68,7 +68,7 @@ func TestDB_Merge3(t *testing.T) {
 	opts.DataFileSize = 32 * 1024 * 1024
 	opts.DirPath = dir
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 

engine/put_get_test.go

@@ -16,7 +16,7 @@ func TestPutAndGet(t *testing.T) {
 	opts.DirPath = dir
 	opts.DataFileSize = 64 * 1024 * 1024
 	db, err := NewDB(opts)
-	defer destroyDB(db)
+	defer db.Clean()
 	assert.Nil(t, err)
 	assert.NotNil(t, db)